Skip to content

Commit fce3c82

Browse files
committed
Merge pull request #598 from bignimbus/master
optional space between /* and csslint in embedded ruleset; fixes #549
2 parents fa16a37 + 860a9ce commit fce3c82

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/core/CSSLint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var CSSLint = (function(){
1313

1414
var rules = [],
1515
formatters = [],
16-
embeddedRuleset = /\/\*csslint([^\*]*)\*\//,
16+
embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//,
1717
api = new parserlib.util.EventTarget();
1818

1919
api.version = "@VERSION@";

tests/core/CSSLint.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@
3737
Assert.areEqual(undefined, ruleset["adjoining-classes"]);
3838
Assert.areEqual(1, ruleset["text-indent"]);
3939
Assert.areEqual(1, ruleset["box-sizing"]);
40+
},
41+
42+
"Embedded rulesets should accept whitespace between /* and 'csslint'": function () {
43+
var result = CSSLint.verify("/* csslint bogus, adjoining-classes:true, box-sizing:false */\n.foo.bar{}", {
44+
"text-indent": 1,
45+
"box-sizing": 1
46+
});
47+
48+
Assert.areEqual(2, result.ruleset["adjoining-classes"]);
49+
Assert.areEqual(1, result.ruleset["text-indent"]);
50+
Assert.areEqual(0, result.ruleset["box-sizing"]);
4051
}
4152

4253
}));

0 commit comments

Comments
 (0)