diff options
author | Chris Rebert <github@rebertia.com> | 2015-05-15 22:07:04 +0300 |
---|---|---|
committer | Chris Rebert <github@rebertia.com> | 2015-05-15 22:07:04 +0300 |
commit | 64057ece3ae78c8eacc5eeeb01d1c147f5a76cb4 (patch) | |
tree | f631b8b3e7e0d0aa8c069fd68e162751cbe3bfa6 | |
parent | 2c3c597113d8732255b25759ad6074988e9d41b6 (diff) | |
parent | 5d5d5856193caa54413a44432953176e4d1af162 (diff) |
Merge pull request #21 from twbs/css-mq-parser
css-mediaquery => css-mq-parser
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/nodejs/postprocessor.js | 4 | ||||
-rw-r--r-- | test/postprocessor_test.js | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/package.json b/package.json index e3a92ef..197212d 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "homepage": "https://github.com/twbs/mq4-hover-shim", "dependencies": { - "css-mediaquery": "^0.1.2", + "css-mq-parser": "^0.0.2", "postcss": "^4.0.0" }, "devDependencies": { diff --git a/src/nodejs/postprocessor.js b/src/nodejs/postprocessor.js index b10d47f..00aaa2b 100644 --- a/src/nodejs/postprocessor.js +++ b/src/nodejs/postprocessor.js @@ -9,12 +9,12 @@ 'use strict'; var postcss = require('postcss'); -var mediaQuery = require('css-mediaquery'); +var parseMediaQuery = require('css-mq-parser'); // Returns media type iff the at-rule is: @media optional-media-type (hover: hover) {...} function mediaTypeIfSimpleHoverHover(atRule) { - var mediaOrs = mediaQuery.parse(atRule.params); + var mediaOrs = parseMediaQuery(atRule.params); if (mediaOrs.length !== 1) { return false; } diff --git a/test/postprocessor_test.js b/test/postprocessor_test.js index 3a9e36d..ad47242 100644 --- a/test/postprocessor_test.js +++ b/test/postprocessor_test.js @@ -56,8 +56,8 @@ exports.mq4HoverShim = { "@media (hover: hover), (orientation: landscape) { .foobar { display: none; } }" ); test.deepEqual( - postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen (hover: hover), (orientation: landscape) { .foobar { display: none; } }").css, - "@media screen (hover: hover), (orientation: landscape) { .foobar { display: none; } }" + postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen and (hover: hover), screen and (orientation: landscape) { .foobar { display: none; } }").css, + "@media screen and (hover: hover), screen and (orientation: landscape) { .foobar { display: none; } }" ); test.done(); }, @@ -68,8 +68,8 @@ exports.mq4HoverShim = { "@media (hover: hover) and (orientation: landscape) { .foobar { display: none; } }" ); test.deepEqual( - postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen (hover: hover) and (orientation: landscape) { .foobar { display: none; } }").css, - "@media screen (hover: hover) and (orientation: landscape) { .foobar { display: none; } }" + postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen and (hover: hover) and (orientation: landscape) { .foobar { display: none; } }").css, + "@media screen and (hover: hover) and (orientation: landscape) { .foobar { display: none; } }" ); test.done(); }, @@ -108,23 +108,23 @@ exports.mq4HoverShim = { "@media (orientation: landscape) { PREFIX>.foobar { display: none; } }" ); test.deepEqual( - postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen (orientation: landscape) { @media (hover: hover) { .foobar { display: none; } } }").css, - "@media screen (orientation: landscape) { PREFIX>.foobar { display: none; } }" + postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen and (orientation: landscape) { @media (hover: hover) { .foobar { display: none; } } }").css, + "@media screen and (orientation: landscape) { PREFIX>.foobar { display: none; } }" ); test.deepEqual( postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media (hover: hover) { @media (orientation: landscape) { .foobar { display: none; } } }").css, "@media (orientation: landscape) {\n PREFIX>.foobar {\n display: none;\n }\n}" ); test.deepEqual( - postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media (hover: hover) { @media screen (orientation: landscape) { .foobar { display: none; } } }").css, - "@media screen (orientation: landscape) {\n PREFIX>.foobar {\n display: none;\n }\n}" + postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media (hover: hover) { @media screen and (orientation: landscape) { .foobar { display: none; } } }").css, + "@media screen and (orientation: landscape) {\n PREFIX>.foobar {\n display: none;\n }\n}" ); test.done(); }, 'handles applicable media types': function (test) { test.expect(1); test.deepEqual( - postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen (hover: hover) { .foobar { display: none; } }").css, + postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media screen and (hover: hover) { .foobar { display: none; } }").css, "@media screen { PREFIX>.foobar { display: none; } }" ); test.done(); @@ -132,7 +132,7 @@ exports.mq4HoverShim = { 'handles non-applicable media types': function (test) { test.expect(1); test.deepEqual( - postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media print (hover: hover) { .foobar { display: none; } }").css, + postprocessor({hoverSelectorPrefix: 'PREFIX>'}).process("@media print and (hover: hover) { .foobar { display: none; } }").css, "" ); test.done(); |