Skip to content

Fix media query stringification #47

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

Closed
wants to merge 1 commit into from
Closed

Fix media query stringification #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/css/MediaQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
*/
function MediaQuery(modifier, mediaType, features, line, col){

SyntaxUnit.call(this, (modifier ? modifier + " ": "") + (mediaType ? mediaType + " " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);
SyntaxUnit.call(this, (modifier ? modifier + " ": "") + (mediaType ? mediaType : "") +
(mediaType && features.length ? " and " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);

/**
* The media modifier ("not" or "only")
Expand Down
12 changes: 11 additions & 1 deletion tests/css/Parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,8 @@
Assert.isNull(result.modifier);
Assert.areEqual("print", result.mediaType);
Assert.areEqual(0, result.features.length, "Should be zero parts.");

Assert.areEqual("print", result.text);
},

testSimpleMediaQueryNot: function(){
Expand All @@ -903,6 +905,8 @@
Assert.areEqual("not", result.modifier);
Assert.areEqual("print", result.mediaType);
Assert.areEqual(0, result.features.length, "Should be zero parts.");

Assert.areEqual("not print", result.text);
},

testSimpleMediaQueryOnly: function(){
Expand All @@ -915,6 +919,8 @@
Assert.areEqual("only", result.modifier);
Assert.areEqual("print", result.mediaType);
Assert.areEqual(0, result.features.length, "Should be zero parts.");

Assert.areEqual("only print", result.text);
},

testComplexMediaQuery: function(){
Expand All @@ -933,7 +939,9 @@
Assert.areEqual("color", result.features[1].name);
Assert.isNull(result.features[1].value);
Assert.areEqual(35, result.features[1].name.col);


// The parser removes whitespace in ": 3kg"; I'm OK with that.
Assert.areEqual("screen and (max-weight:3kg) and (color)", result.text);
},

testComplexMediaQuery2: function(){
Expand All @@ -950,6 +958,8 @@
Assert.areEqual("768px", result.features[0].value);
Assert.areEqual("orientation", result.features[1].name);
Assert.areEqual("portrait", result.features[1].value);

Assert.areEqual("only screen and (max-device-width:768px) and (orientation:portrait)", result.text);
}


Expand Down