Add support for '.25' instead of '0.25' for alpha string parsing - Closes jquery#46

dy · gnarf · commit c14beaaad487 · 2012-09-22T03:34:20.000-05:00
diff --git a/jquery.color.js b/jquery.color.js
@@ -16,7 +16,7 @@
 	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
 	// a set of RE's that can match strings and generate color tuples.
 	stringParsers = [{
-			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
+			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(0?(?:\.\d+)?)\s*)?\)/,
 			parse: function( execResult ) {
 				return [
 					execResult[ 1 ],
@@ -26,7 +26,7 @@
 				];
 			}
 		}, {
-			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
+			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(0?(?:\.\d+)?)\s*)?\)/,
 			parse: function( execResult ) {
 				return [
 					execResult[ 1 ] * 2.55,
@@ -56,7 +56,7 @@
 				];
 			}
 		}, {
-			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
+			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(0?(?:\.\d+)?)\s*)?\)/,
 			space: "hsla",
 			parse: function( execResult ) {
 				return [
diff --git a/test/test.html b/test/test.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <script type="text/javascript" src="jquery-1.5.1.js"></script>
+    <script type="text/javascript" src="../jquery.color.js"></script>
+  </head>
+  <body>
+    <div id="test" style="background-color: #00ffff">Test string</div>
+ 
+    <script type="text/javascript">
+//<![CDATA[
+      
+      var $div = $("#test");
+      $div./*animate({"background-color": "#ffff00"}, 300).*/
+        animate({"background-color": 'transparent'}, 400);
+ 
+//      var savedColor = $div.css("backgroundColor");
+//      alert(savedColor);
+//      $div.animate({"background-color": "#ffff00"}, 300).
+//        animate({"background-color": savedColor}, 400);
+ 
+//]]>
+    </script>
+ 
+  </body>
+</html>
diff --git a/test/unit/color.js b/test/unit/color.js
@@ -168,6 +168,8 @@ parseTest( "rgb(127,127,127)", fiftypercent );
 parseTest( "rgb(50%,50%,50%)", fiftypercent );
 parseTest( "rgba(127,127,127,0.5)", fiftypercentalpha );
 parseTest( "rgba(50%,50%,50%,0.5)", fiftypercentalpha );
+parseTest( "rgba(127, 127, 127, .5)", fiftypercentalpha );
+parseTest( "rgba(50%, 50%, 50%, .5)", fiftypercentalpha );
 parseTest( "rgba(0, 0, 0, 0)", {
 	expect: 4,
 	red: null,
@@ -407,6 +409,17 @@ parseTest("hsla(180,50%,50%,0.5)", {
 	alpha: 0.5
 });
 
+parseTest("hsla( 180, 50%, 50%, .5 )", {
+	expect: 7,
+	hue: 180,
+	saturation: 0.5,
+	lightness: 0.5,
+	red: 64,
+	green: 191,
+	blue: 191,
+	alpha: 0.5
+});
+
 parseTest("hsl(72, 77%, 59%)", {
 	expect: 7,
 	hue: 72,
@@ -605,4 +618,4 @@ test( "jQuery.Color.hook() - Create new hooks for color properties", 2, function
 	ok( jQuery.fx.step.testy, "fx.step testy hook created" );
 	delete jQuery.cssHooks.testy;
 	delete jQuery.fx.step.testy;
-});
+});
