Merge pull request #157 from tophf/fix-kf-doc

Fixes for @document blocks

Author: XhmikosR

src/css/Parser.js

@@ -795,21 +795,21 @@ Parser.prototype = function(){
                     col:       token.startCol
                 });
 
-                while(true) {
-                    if (tokenStream.peek() === Tokens.PAGE_SYM){
-                        this._page();
-                    } else if (tokenStream.peek() === Tokens.FONT_FACE_SYM){
-                        this._font_face();
-                    } else if (tokenStream.peek() === Tokens.VIEWPORT_SYM){
-                        this._viewport();
-                    } else if (tokenStream.peek() === Tokens.MEDIA_SYM){
-                        this._media();
-                    } else if (!this._ruleset()){
-                        break;
+                var ok = true;
+                while (ok) {
+                    switch (tokenStream.peek()) {
+                        case Tokens.PAGE_SYM:       this._page(); break;
+                        case Tokens.FONT_FACE_SYM:  this._font_face(); break;
+                        case Tokens.VIEWPORT_SYM:   this._viewport(); break;
+                        case Tokens.MEDIA_SYM:      this._media(); break;
+                        case Tokens.KEYFRAMES_SYM:  this._keyframes(); break;
+                        case Tokens.DOCUMENT_SYM:   this._document(); break;
+                        default:                    ok = !!this._ruleset();
                     }
                 }
 
                 tokenStream.mustMatch(Tokens.RBRACE);
+                token = tokenStream.token();
                 this._readWhitespace();
 
                 this.fire({
@@ -1988,6 +1988,7 @@ Parser.prototype = function(){
 
                 this._readWhitespace();
                 tokenStream.mustMatch(Tokens.RBRACE);
+                this._readWhitespace();
 
             },
 

tests/css/CSSParserTests.htm

@@ -1632,6 +1632,18 @@ <h1>CSS Parser Tests</h1>
             assert.isTrue(valid);
         },
 
+        testDocumentWithKeyframes: function(){
+            var parser = new Parser({ strict: true}),
+                valid = true;
+
+            parser.addListener("error", function(event) {
+                valid = false;
+            });
+
+            var result = parser.parse("@document url-prefix() { @keyframes 'diagonal-slide' {  from { left: 0; top: 0; } to { left: 100px; top: 100px; } } }");
+            assert.isTrue(valid);
+        },
+
         testDocumentEventFires: function(){
             var parser = new Parser({ strict:true}),
                 calledStart = false,
@@ -1645,7 +1657,7 @@ <h1>CSS Parser Tests</h1>
 
             parser.addListener("enddocument", function(event) {
                 assert.areEqual(1, event.line, "Line should be 1");
-                assert.areEqual(1, event.col, "Column should be 1");
+                assert.areEqual(25, event.col, "Column should be 25");
                 calledEnd = true;
             });
 

tests/css/Parser.js

@@ -1808,6 +1808,18 @@
             Assert.isTrue(valid);
         },
 
+        testDocumentWithKeyframes: function(){
+            var parser = new Parser({ strict: true}),
+                valid = true;
+
+            parser.addListener("error", function(event) {
+                valid = false;
+            });
+
+            var result = parser.parse("@document url-prefix() { @keyframes 'diagonal-slide' {  from { left: 0; top: 0; } to { left: 100px; top: 100px; } } }");
+            Assert.isTrue(valid);
+        },
+
         testDocumentEventFires: function(){
             var parser = new Parser({ strict:true}),
                 calledStart = false,
@@ -1821,7 +1833,7 @@
 
             parser.addListener("enddocument", function(event) {
                 Assert.areEqual(1, event.line, "Line should be 1");
-                Assert.areEqual(1, event.col, "Column should be 1");
+                Assert.areEqual(25, event.col, "Column should be 25");
                 calledEnd = true;
             });