Merge pull request #631 from gurdiga/unqualified-attrs-fix

Selectors containing #id or .class are considered to be qualified

Author: frvge

src/rules/unqualified-attributes.js

@@ -13,11 +13,13 @@ CSSLint.addRule({
     //initialization
     init: function(parser, reporter) {
         "use strict";
+
         var rule = this;
 
         parser.addListener("startrule", function(event) {
 
             var selectors = event.selectors,
+                selectorContainsClassOrId = false,
                 selector,
                 part,
                 modifier,
@@ -30,8 +32,19 @@ CSSLint.addRule({
                 if (part.type === parser.SELECTOR_PART_TYPE) {
                     for (k=0; k < part.modifiers.length; k++) {
                         modifier = part.modifiers[k];
-                        if (modifier.type === "attribute" && (!part.elementName || part.elementName === "*")) {
-                            reporter.report(rule.desc, part.line, part.col, rule);
+
+                        if (modifier.type === "class" || modifier.type === "id") {
+                          selectorContainsClassOrId = true;
+                          break;
+                        }
+                    }
+
+                    if (!selectorContainsClassOrId) {
+                        for (k=0; k < part.modifiers.length; k++) {
+                            modifier = part.modifiers[k];
+                            if (modifier.type === "attribute" && (!part.elementName || part.elementName === "*")) {
+                                reporter.report(rule.desc, part.line, part.col, rule);
+                            }
                         }
                     }
                 }

tests/rules/unqualified-attributes.js

@@ -28,8 +28,17 @@
         "Using a qualified attribute selector should not result in a warning": function() {
             var result = CSSLint.verify("input[type=text]  { font-size: 10px; } ", {"unqualified-attributes": 1 });
             Assert.areEqual(0, result.messages.length);
-        }
+        },
 
+        "Using an attribute selector qualified by a class should not result in a warning": function(){
+            var result = CSSLint.verify(".fancy[type=text] { font-size: 10px; }", {"unqualified-attributes": 1 });
+            Assert.areEqual(0, result.messages.length);
+        },
+
+        "Using an attribute selector qualified by an ID should not result in a warning": function(){
+            var result = CSSLint.verify("#fancy[type=text] { font-size: 10px; }", {"unqualified-attributes": 1 });
+            Assert.areEqual(0, result.messages.length);
+        }
 
     }));