Skip to content

Commit fd53767

Browse files
committed
Parse property and modifier from media query features
1 parent 015c217 commit fd53767

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ function match(mediaQuery, values) {
1818

1919
var RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s\(\)]+)\s*and\s*)?(.+)?/i,
2020
RE_MQ_EXPRESSION = /\(\s*([^\s\:\)]+)\s*(?:\:\s*([^\s\)]+))?\s*\)/,
21+
RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
2122
RE_LENGTH_VALUE = /(\d+)(em|rem|px|cm|mm|in|pt|pc)?/;
2223

2324
function parseQuery(mediaQuery) {
@@ -36,11 +37,14 @@ function parseQuery(mediaQuery) {
3637
expressions = expressions.match(/\([^\)]+\)/g);
3738

3839
parsed.expressions = expressions.map(function (expression) {
39-
var captures = expression.match(RE_MQ_EXPRESSION);
40+
var captures = expression.match(RE_MQ_EXPRESSION),
41+
feature = captures[1].toLowerCase().match(RE_MQ_FEATURE);
4042

4143
return {
42-
feature: captures[1].toLowerCase(),
43-
value : captures[2]
44+
feature : feature[0],
45+
modifier: feature[1],
46+
property: feature[2],
47+
value : captures[2]
4448
};
4549
});
4650

0 commit comments

Comments
 (0)