media-query can now be a variable

NDMarcel · NDMarcel · commit 9f9eeec2974c · 2012-02-20T17:28:24.000+01:00
diff --git a/lib/less/parser.js b/lib/less/parser.js
@@ -1074,11 +1074,18 @@ less.Parser = function Parser(env) {
             },
 
             mediaFeatures: function () {
-                var f, features = [];
-                while (f = $(this.mediaFeature)) {
-                    features.push(f);
-                    if (! $(',')) { break }
-                }
+                var features = [];
+                
+                do {
+                  if (e = $(this.mediaFeature)) {
+                      features.push(e);
+                      if (! $(',')) { break }
+                  } else if (e = $(this.entities.variable)) {
+                      features.push(e);
+                      if (! $(',')) { break }
+                  }
+                } while (e);
+                
                 return features.length > 0 ? features : null;
             },
 
diff --git a/test/css/media.css b/test/css/media.css
@@ -25,3 +25,6 @@
     max-width: 480px;
   }
 }
+@media only screen and (max-width: 200px) {
+  width: 480px;
+}
diff --git a/test/less/media.less b/test/less/media.less
@@ -5,7 +5,7 @@
 
 @media print {
     .class {
-        color: blue;    
+        color: blue;
         .sub {
             width: @var;
         }
@@ -29,3 +29,8 @@
         max-width: 480px;
     }
 }
+
+@smartphone: ~"only screen and (max-width: 200px)";
+@media @smartphone {
+  width: 480px;
+}

Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,6 @@`
`25`	`25`	`max-width: 480px;`
`26`	`26`	`}`
`27`	`27`	`}`
	`28`	`+@media only screen and (max-width: 200px) {`
	`29`	`+ width: 480px;`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`@media print {`
`7`	`7`	`.class {`
`8`		`- color: blue;`
	`8`	`+ color: blue;`
`9`	`9`	`.sub {`
`10`	`10`	`width: @var;`
`11`	`11`	`}`
`@@ -29,3 +29,8 @@`
`29`	`29`	`max-width: 480px;`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+@smartphone: ~"only screen and (max-width: 200px)";`
	`34`	`+@media @smartphone {`
	`35`	`+ width: 480px;`
	`36`	`+}`