From b151cb131f8456e73e54ae52053e37c42dd7b69d Mon Sep 17 00:00:00 2001 From: Jeff Auriemma Date: Thu, 28 May 2015 23:22:41 -0500 Subject: [PATCH 1/3] optional space between /* and csslint in embedded ruleset; fixes #549 --- src/core/CSSLint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/CSSLint.js b/src/core/CSSLint.js index 9c4f84ba..8011950b 100644 --- a/src/core/CSSLint.js +++ b/src/core/CSSLint.js @@ -13,7 +13,7 @@ var CSSLint = (function(){ var rules = [], formatters = [], - embeddedRuleset = /\/\*csslint([^\*]*)\*\//, + embeddedRuleset = /\/\*\s?csslint([^\*]*)\*\//, api = new parserlib.util.EventTarget(); api.version = "@VERSION@"; From b65a6624aa51422a96a0e8aec8d28e58dc5154e4 Mon Sep 17 00:00:00 2001 From: Jeff Auriemma Date: Tue, 2 Jun 2015 14:50:50 -0500 Subject: [PATCH 2/3] update regex for accepting whitespace in embedded rulesets #549 --- src/core/CSSLint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/CSSLint.js b/src/core/CSSLint.js index 8011950b..cb60d219 100644 --- a/src/core/CSSLint.js +++ b/src/core/CSSLint.js @@ -13,7 +13,7 @@ var CSSLint = (function(){ var rules = [], formatters = [], - embeddedRuleset = /\/\*\s?csslint([^\*]*)\*\//, + embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//, api = new parserlib.util.EventTarget(); api.version = "@VERSION@"; From 860a9ced488edf4adbdbe3f6afcb84f1ec862301 Mon Sep 17 00:00:00 2001 From: Jeff Auriemma Date: Tue, 2 Jun 2015 14:51:50 -0500 Subject: [PATCH 3/3] add test specs for whitespace in embedded rulesets #549 --- tests/core/CSSLint.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/core/CSSLint.js b/tests/core/CSSLint.js index 967feb5b..73ce34ef 100644 --- a/tests/core/CSSLint.js +++ b/tests/core/CSSLint.js @@ -37,6 +37,17 @@ Assert.areEqual(undefined, ruleset["adjoining-classes"]); Assert.areEqual(1, ruleset["text-indent"]); Assert.areEqual(1, ruleset["box-sizing"]); + }, + + "Embedded rulesets should accept whitespace between /* and 'csslint'": function () { + var result = CSSLint.verify("/* csslint bogus, adjoining-classes:true, box-sizing:false */\n.foo.bar{}", { + "text-indent": 1, + "box-sizing": 1 + }); + + Assert.areEqual(2, result.ruleset["adjoining-classes"]); + Assert.areEqual(1, result.ruleset["text-indent"]); + Assert.areEqual(0, result.ruleset["box-sizing"]); } }));