change to array some

jesstech · Jun 19, 2015 · f7b0da3 · f7b0da3
1 parent dff48e5
commit f7b0da3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/index.js b/index.js
@@ -23,17 +23,7 @@ module.exports = postcss.plugin('postcss-pxtorem', function (options) {
         css.eachDecl(function (decl, i) {
             if (propWhiteList.indexOf(decl.prop) === -1) return;
 
-            var selector = decl.parent.selector;
-            var match = false;
-            for (var j=0; j<selectorBlackList.length; j++) {
-                match = selector.match(selectorBlackList[j]);
-                if (match) {
-                    break;
-                }
-            }
-            if (match) {
-                return;
-            }
+            if (blacklistedSelector(selectorBlackList, decl.parent.selector)) return;
 
             var rule = decl.parent;
             var value = decl.value;
@@ -76,3 +66,9 @@ function remExists(decls, prop, value) {
         return (decl.prop === prop && decl.value === value);
     });
 }
+
+function blacklistedSelector(blacklist, selector) {
+    return blacklist.some(function (regex) {
+        return selector.match(regex);
+    });
+}
diff --git a/spec/pxtorem-spec.js b/spec/pxtorem-spec.js
@@ -12,17 +12,6 @@ var css = '.rule { font-size: 15px }';
 
 describe('pxtorem', function () {
 
-    it('should ignore selectors in the selector black list', function () {
-        var rules = '.rule { font-size: 15px } .rule2 { font-size: 15px }';
-        var expected = '.rule { font-size: 0.9375rem } .rule2 { font-size: 15px }';
-        var options = {
-            selector_black_list: ['.rule2']
-        };
-        var processed = postcss(pxtorem(options)).process(rules).css;
-
-        expect(processed).toBe(expected);
-    });
-
     it('should replace the px unit with rem', function () {
         var processed = postcss(pxtorem()).process(css).css;
         var expected = '.rule { font-size: 0.9375rem }';
@@ -60,6 +49,17 @@ describe('pxtorem', function () {
         expect(processed).toBe(expected);
     });
 
+    it('should ignore selectors in the selector black list', function () {
+        var rules = '.rule { font-size: 15px } .rule2 { font-size: 15px }';
+        var expected = '.rule { font-size: 0.9375rem } .rule2 { font-size: 15px }';
+        var options = {
+            selector_black_list: ['.rule2']
+        };
+        var processed = postcss(pxtorem(options)).process(rules).css;
+
+        expect(processed).toBe(expected);
+    });
+
     it('should leave fallback pixel unit with root em value', function () {
         var options = {
             replace: false