Skip to content

Bugfixes #11

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

Open
maltewassermann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfixes #11

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff81c06
Fixed issue #7
Jun 21, 2014
c48eac5
Fixed issue #10
Jun 21, 2014
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
Next Next commit
Fixed issue #7
  • Loading branch information
Malte Wassermann committed Jun 21, 2014
commit ff81c06f48a124ec1221da627760df1d0b31a509
11 changes: 7 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ exports.parse = parseQuery;

var RE_MEDIA_QUERY = /^(?:(only|not)?\s*([_a-z][_a-z0-9-]*)|(\([^\)]+\)))(?:\s*and\s*(.*))?$/i,
RE_MQ_EXPRESSION = /^\(\s*([_a-z-][_a-z0-9-]*)\s*(?:\:\s*([^\)]+))?\s*\)$/,
RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
RE_MQ_FEATURE = /^(?:-(webkit|moz|o)-)?(?:(min|max)-)?(?:-(moz)-)?(.+)/,
RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?\s*$/,
RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?\s*$/;
RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?\s*$/,
RE_COMMENTS = /\/\*[^*]*\*+([^/][^*]*\*+)*\//gi;

function matchQuery(mediaQuery, values) {
return parseQuery(mediaQuery).some(function (query) {
Expand Down Expand Up @@ -86,6 +87,8 @@ function matchQuery(mediaQuery, values) {

function parseQuery(mediaQuery) {
return mediaQuery.split(',').map(function (query) {
// Remove comments first
query = query.replace(RE_COMMENTS, '');
query = query.trim();

var captures = query.match(RE_MEDIA_QUERY);
Expand Down Expand Up @@ -128,8 +131,8 @@ function parseQuery(mediaQuery) {
var feature = captures[1].toLowerCase().match(RE_MQ_FEATURE);

return {
modifier: feature[1],
feature : feature[2],
modifier: feature[2],
feature : feature[4],
value : captures[2]
};
});
Expand Down