Skip to content

MediaQuery.text minor bug #30

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
merged 3 commits into from
Nov 16, 2012
Merged

MediaQuery.text minor bug #30

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
74592d6
Update build/node-parserlib.js
mirceapiturca Aug 23, 2012
081dddb
Update src/css/MediaQuery.js
mirceapiturca Aug 24, 2012
a66dfbd
Update tests/css/Parser.js
mirceapiturca Sep 12, 2012
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
2 changes: 1 addition & 1 deletion build/node-parserlib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@ MediaFeature.prototype.constructor = MediaFeature;
*/
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 > 0 ? " and " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);

/**
* The media modifier ("not" or "only")
Expand Down
2 changes: 1 addition & 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,7 @@
*/
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 > 0 ? " and " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);

/**
* The media modifier ("not" or "only")
Expand Down
5 changes: 5 additions & 0 deletions tests/css/Parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@
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 +904,7 @@
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 +917,7 @@
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,6 +936,7 @@
Assert.areEqual("color", result.features[1].name);
Assert.isNull(result.features[1].value);
Assert.areEqual(35, result.features[1].name.col);
Assert.areEqual("screen and (max-weight: 3kg) and (color)", result.text);

},

Expand All @@ -950,6 +954,7 @@
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