Skip to content

Commit c476289

Browse files
committed
Fixed media query tests
1 parent 172a2b2 commit c476289

File tree

7 files changed

+821
-816
lines changed

7 files changed

+821
-816
lines changed

build/node-parserlib.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 14-November-2012 10:32:32 */
24+
/* Version v@VERSION@, Build time: 16-November-2012 11:43:35 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v@VERSION@, Build time: 14-November-2012 10:32:32 */
934+
/* Version v@VERSION@, Build time: 16-November-2012 11:43:35 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -1169,7 +1169,7 @@ MediaFeature.prototype.constructor = MediaFeature;
11691169
*/
11701170
function MediaQuery(modifier, mediaType, features, line, col){
11711171

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

11741174
/**
11751175
* The media modifier ("not" or "only")

build/npm/lib/node-parserlib.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 14-November-2012 10:32:32 */
24+
/* Version v@VERSION@, Build time: 16-November-2012 11:43:35 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v@VERSION@, Build time: 14-November-2012 10:32:32 */
934+
/* Version v@VERSION@, Build time: 16-November-2012 11:43:35 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -1169,7 +1169,7 @@ MediaFeature.prototype.constructor = MediaFeature;
11691169
*/
11701170
function MediaQuery(modifier, mediaType, features, line, col){
11711171

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

11741174
/**
11751175
* The media modifier ("not" or "only")

build/parserlib-core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 14-November-2012 10:32:32 */
24+
/* Version v@VERSION@, Build time: 16-November-2012 11:43:35 */
2525
var parserlib = {};
2626
(function(){
2727

build/parserlib-css.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 14-November-2012 10:32:32 */
24+
/* Version v@VERSION@, Build time: 16-November-2012 11:43:35 */
2525
(function(){
2626
var EventTarget = parserlib.util.EventTarget,
2727
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -259,7 +259,7 @@ MediaFeature.prototype.constructor = MediaFeature;
259259
*/
260260
function MediaQuery(modifier, mediaType, features, line, col){
261261

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

264264
/**
265265
* The media modifier ("not" or "only")

0 commit comments

Comments
 (0)