Merge remote-tracking branch 'origin/glenn/css-utils-fixes' into pfly…

…nn/css-utils-tests * origin/glenn/css-utils-fixes: Add support for *, and trailing id selector
adobe · Mar 3, 2012 · cb6a1a7 · cb6a1a7
2 parents a8af2d5 + 9de39f8
commit cb6a1a7
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/CSSUtils.js b/src/CSSUtils.js
@@ -154,10 +154,15 @@ define(function (require, exports, module) {
             selector = "(^|\\s)" + selector;
         }
 
-        var re = new RegExp(selector + "(\\[[^\\]]*\\]|:{1,2}[\\w-]+|\\.[\\w-]+)*\\s*$", classOrIdSelector ? "" : "i");
+        var re = new RegExp(selector + "(\\[[^\\]]*\\]|:{1,2}[\\w-]+|\\.[\\w-]+|#[\\w-]+)*\\s*$", classOrIdSelector ? "" : "i");
         for (i = 0; i < allSelectors.length; i++) {
             if (allSelectors[i].selector.search(re) !== -1) {
                 result.push(allSelectors[i]);
+            } else if (!classOrIdSelector) {
+                // Special case for tag selectors - match "*"
+                if (allSelectors[i].selector.trim() === "*") {
+                    result.push(allSelectors[i]);
+                }
             }
         }