Skip to content

Parse attribute selectors with comma #83

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 1 commit into from
May 16, 2014
Merged

Parse attribute selectors with comma #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fixed selector parser to parse attribute selectors with/without comma… 
… properly
  • Loading branch information
@marcelduran
marcelduran committed Apr 17, 2014
commit b00ff747385ae03e8babd1b19dcd3b948c38f91f
10 changes: 9 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,15 @@ module.exports = function(css, options){
if (!m) return;
/* @fix Remove all comments from selectors
* http://ostermiller.org/findcomment.html */
return trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, '').split(/\s*,\s*/);
return trim(m[0])
.replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, '')
.replace(/(?:"[^"]*"|'[^']*')/g, function(m) {
return m.replace(/,/g, '\u200C');
})
.split(/\s*,\s*/)
.map(function(s) {
return s.replace(/\u200C/g, ',');
});
}

/**
Expand Down
39 changes: 39 additions & 0 deletions test/cases/comma-attribute.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.foo[bar="baz,quz"] {
foobar: 123;
}

.bar,
#bar[baz="qux,foo"],
#qux {
foobar: 456;
}

.baz[qux=",foo"],
.baz[qux="foo,"],
.baz[qux="foo,bar,baz"],
.baz[qux=",foo,bar,baz,"],
.baz[qux=" , foo , bar , baz , "] {
foobar: 789;
}

.qux[foo='bar,baz'],
.qux[bar="baz,foo"],
#qux[foo="foobar"],
#qux[foo=',bar,baz, '] {
foobar: 012;
}

#foo[foo=""],
#foo[bar=" "],
#foo[bar=","],
#foo[bar=", "],
#foo[bar=" ,"],
#foo[bar=" , "],
#foo[baz=''],
#foo[qux=' '],
#foo[qux=','],
#foo[qux=', '],
#foo[qux=' ,'],
#foo[qux=' , '] {
foobar: 345;
}
202 changes: 202 additions & 0 deletions test/cases/comma-attribute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
{
"type": "stylesheet",
"stylesheet": {
"rules": [
{
"type": "rule",
"selectors": [
".foo[bar=\"baz,quz\"]"
],
"declarations": [
{
"type": "declaration",
"property": "foobar",
"value": "123",
"position": {
"start": {
"line": 2,
"column": 3
},
"end": {
"line": 2,
"column": 14
},
"source": "comma-attribute.css"
}
}
],
"position": {
"start": {
"line": 1,
"column": 1
},
"end": {
"line": 3,
"column": 2
},
"source": "comma-attribute.css"
}
},
{
"type": "rule",
"selectors": [
".bar",
"#bar[baz=\"qux,foo\"]",
"#qux"
],
"declarations": [
{
"type": "declaration",
"property": "foobar",
"value": "456",
"position": {
"start": {
"line": 8,
"column": 3
},
"end": {
"line": 8,
"column": 14
},
"source": "comma-attribute.css"
}
}
],
"position": {
"start": {
"line": 5,
"column": 1
},
"end": {
"line": 9,
"column": 2
},
"source": "comma-attribute.css"
}
},
{
"type": "rule",
"selectors": [
".baz[qux=\",foo\"]",
".baz[qux=\"foo,\"]",
".baz[qux=\"foo,bar,baz\"]",
".baz[qux=\",foo,bar,baz,\"]",
".baz[qux=\" , foo , bar , baz , \"]"
],
"declarations": [
{
"type": "declaration",
"property": "foobar",
"value": "789",
"position": {
"start": {
"line": 16,
"column": 3
},
"end": {
"line": 16,
"column": 14
},
"source": "comma-attribute.css"
}
}
],
"position": {
"start": {
"line": 11,
"column": 1
},
"end": {
"line": 17,
"column": 2
},
"source": "comma-attribute.css"
}
},
{
"type": "rule",
"selectors": [
".qux[foo='bar,baz']",
".qux[bar=\"baz,foo\"]",
"#qux[foo=\"foobar\"]",
"#qux[foo=',bar,baz, ']"
],
"declarations": [
{
"type": "declaration",
"property": "foobar",
"value": "012",
"position": {
"start": {
"line": 23,
"column": 3
},
"end": {
"line": 23,
"column": 14
},
"source": "comma-attribute.css"
}
}
],
"position": {
"start": {
"line": 19,
"column": 1
},
"end": {
"line": 24,
"column": 2
},
"source": "comma-attribute.css"
}
},
{
"type": "rule",
"selectors": [
"#foo[foo=\"\"]",
"#foo[bar=\" \"]",
"#foo[bar=\",\"]",
"#foo[bar=\", \"]",
"#foo[bar=\" ,\"]",
"#foo[bar=\" , \"]",
"#foo[baz='']",
"#foo[qux=' ']",
"#foo[qux=',']",
"#foo[qux=', ']",
"#foo[qux=' ,']",
"#foo[qux=' , ']"
],
"declarations": [
{
"type": "declaration",
"property": "foobar",
"value": "345",
"position": {
"start": {
"line": 38,
"column": 3
},
"end": {
"line": 38,
"column": 14
},
"source": "comma-attribute.css"
}
}
],
"position": {
"start": {
"line": 26,
"column": 1
},
"end": {
"line": 39,
"column": 2
},
"source": "comma-attribute.css"
}
}
]
}
}