Merge pull request #109 from hartman/viewport_in_media

Allow @Viewport to be inside of @media

Author: nzakas

src/css/Parser.js

@@ -364,8 +364,10 @@ Parser.prototype = function(){
                 while(true) {
                     if (tokenStream.peek() == Tokens.PAGE_SYM){
                         this._page();
-                    } else   if (tokenStream.peek() == Tokens.FONT_FACE_SYM){
+                    } else if (tokenStream.peek() == Tokens.FONT_FACE_SYM){
                         this._font_face();
+                    } else if (tokenStream.peek() == Tokens.VIEWPORT_SYM){
+                        this._viewport();
                     } else if (!this._ruleset()){
                         break;
                     }

tests/css/CSSTokensTests.htm

@@ -183,6 +183,9 @@ <h1>CSS Tokens Tests</h1>
             "@right-middle" : CSSTokens.RIGHTMIDDLE_SYM,
             "@right-bottom" : CSSTokens.RIGHTBOTTOM_SYM,
 
+            "@-ms-viewport" : CSSTokens.VIEWPORT_SYM,
+            "@viewport"     : CSSTokens.VIEWPORT_SYM,
+
             //animation
             "@-webkit-keyframes":   CSSTokens.KEYFRAMES_SYM,
             "@-moz-keyframes"   : CSSTokens.KEYFRAMES_SYM,

tests/css/Parser.js

@@ -1498,6 +1498,12 @@
             Assert.isTrue(true);  //just don't want an error
         },
 
+	testMediaWithViewport: function(){
+            var parser = new Parser({ strict: true});
+            var result = parser.parse("@media { @viewport {} }");
+            Assert.isTrue(true);  //just don't want an error
+        },
+
         testMediaWithTypeOnly: function(){
             var parser = new Parser({ strict: true});
             var result = parser.parse("@media print { }");