Merge pull request #8057 from HighwayChile/highway/issue-8028

made whitespace character optional
adobe · Jun 16, 2014 · 138e963 · 138e963
2 parents ee20b54 + c8cf483
commit 138e963
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/src/extensions/default/QuickView/main.js b/src/extensions/default/QuickView/main.js
@@ -162,7 +162,7 @@ define(function (require, exports, module) {
 
         // Check for gradient. -webkit-gradient() can have parens in parameters
         // nested 2 levels. Other gradients can only nest 1 level.
-        var gradientRegEx = /-webkit-gradient\((?:[^\(]*?(?:\((?:[^\(]*?(?:\([^\)]*?\))*?)*?\))*?)*?\)|(?:(?:-moz-|-ms-|-o-|-webkit-|\s)((repeating-)?linear-gradient)|(?:-moz-|-ms-|-o-|-webkit-|\s)((repeating-)?radial-gradient))(\((?:[^\)]*?(?:\([^\)]*?\))*?)*?\))/gi,
+        var gradientRegEx = /-webkit-gradient\((?:[^\(]*?(?:\((?:[^\(]*?(?:\([^\)]*?\))*?)*?\))*?)*?\)|(?:(?:-moz-|-ms-|-o-|-webkit-|:|\s)((repeating-)?linear-gradient)|(?:-moz-|-ms-|-o-|-webkit-|:|\s)((repeating-)?radial-gradient))(\((?:[^\)]*?(?:\([^\)]*?\))*?)*?\))/gi,
             colorRegEx = new RegExp(ColorUtils.COLOR_REGEX);
 
         function areParensBalanced(str) {

diff --git a/src/extensions/default/QuickView/unittest-files/test.css b/src/extensions/default/QuickView/unittest-files/test.css
@@ -165,3 +165,17 @@ background: -ms-linear-gradient(top,  #d2dfed 0%,#c8d7eb 26%,#bed0ea 51%,#a6c0e3
     background-image: repeating-linear-gradient(red, blue 20px, red 40px);
     background-image: repeating-radial-gradient(red, blue 20px, red 40px);    
 }
+
+.whitespaceCheck_linear_gradient { 
+    background : linear-gradient(to bottom, black 0%, white 100%); 
+    background: linear-gradient(to bottom, black 0%, white 100%);
+    background :linear-gradient(to bottom, black 0%, white 100%);
+    background:linear-gradient(to bottom, black 0%, white 100%);
+}
+
+.whitespaceCheck_radial_gradient {
+    background : radial-gradient(red, white 50%, blue 100%);
+    background: radial-gradient(red, white 50%, blue 100%);
+    background :radial-gradient(red, white 50%, blue 100%);
+    background:radial-gradient(red, white 50%, blue 100%);
+}
diff --git a/src/extensions/default/QuickView/unittests.js b/src/extensions/default/QuickView/unittests.js
@@ -208,7 +208,27 @@ define(function (require, exports, module) {
                     checkGradientAtPos(expectedGradient4, 90, 36);   // test parameters with 2 levels of nested parens
                 });
             });
-
+
+            it("Should show linear gradient preview for those with colon or space before", function () {
+                runs(function () {
+                    var expectedGradient = "linear-gradient(to bottom, black 0%, white 100%)";
+                    checkGradientAtPos(expectedGradient, 169, 25);   // space colon space
+                    checkGradientAtPos(expectedGradient, 170, 25);   // colon space
+                    checkGradientAtPos(expectedGradient, 171, 25);   // space colon
+                    checkGradientAtPos(expectedGradient, 172, 25);   // colon
+                });
+            });
+
+            it("Should show radial gradient preview for those with colon or space before", function () {
+                runs(function () {
+                    var expectedGradient = "radial-gradient(red, white 50%, blue 100%)";
+                    checkGradientAtPos(expectedGradient, 176, 25);   // space colon space
+                    checkGradientAtPos(expectedGradient, 177, 25);   // colon space
+                    checkGradientAtPos(expectedGradient, 178, 25);   // space colon
+                    checkGradientAtPos(expectedGradient, 179, 25);   // colon
+                });
+            });
+
             it("Should show linear gradient preview for those with w3c standard syntax (no prefix)", function () {
                 runs(function () {
                     checkGradientAtPos("linear-gradient(#333, #CCC)",                  99, 50);