Skip to content

Fixes for @document blocks #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XhmikosR merged 3 commits into from
Feb 3, 2016
Merged

Fixes for @document blocks #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46351f5
fix @keyframes: consume trailing whitespace
tophf Jul 15, 2015
866ad1a
fix line, col in "enddocument" event
tophf Jul 15, 2015
c2b5985
support @keyframes and @document inside @document blocks
tophf Jul 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/css/Parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -1988,6 +1988,7 @@ Parser.prototype = function(){

this._readWhitespace();
tokenStream.mustMatch(Tokens.RBRACE);
this._readWhitespace();

},

Expand Down
14 changes: 13 additions & 1 deletion tests/css/CSSParserTests.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
});

Expand Down
14 changes: 13 additions & 1 deletion tests/css/Parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
});

Expand Down