Merge pull request #317 from philipwalton/selector-max

Fixed the selector max and selector max approaching rules

Author: nzakas

README.md

@@ -25,4 +25,5 @@ CSSLint is a tool to help point out problems with your CSS code. It does basic s
 1. Cillian de Róiste, https://plus.google.com/116480676247600483573/posts (Node CLI fixes)
 1. Damien Sennm, https://github.com/topaxi (README fixes)
 1. Jonathan Barnett, http://twitter.com/indieisaconcept (JUnit formatter)
-1. Zach Leatherman, http://www.zachleat.com/ (bug fixes)
+1. Zach Leatherman, http://www.zachleat.com/ (bug fixes)
+1. Philip Walton, http://philipwalton.com (Rules fixes, bug fixes)

src/rules/selector-max-approaching.js

@@ -6,25 +6,23 @@ CSSLint.addRule({
 
     //rule information
     id: "selector-max-approaching",
-    name: "Warn when approaching the 4095 limit for IE",
-    desc: "Will warn when selector count is >= 3800 rules.",
+    name: "Warn when approaching the 4095 selector limit for IE",
+    desc: "Will warn when selector count is >= 3800 selectors.",
     browsers: "IE",
 
     //initialization
-    init: function(parser, reporter){
-		var rule = this,
-			count = 0;
+    init: function(parser, reporter) {
+        var rule = this, count = 0;
 
-		parser.addListener('startrule',function(event){
-			count++;
-
-		});
+        parser.addListener('startrule', function(event) {
+            count += event.selectors.length;
+        });
 
-		parser.addListener("endstylesheet", function(){
-			if(count >= 3800){
-				reporter.report("You have "+count+" rules. Internet Explorer supports a maximum of 4095 rules. Consider refactoring.",0,0,rule);
-			}            
+        parser.addListener("endstylesheet", function() {
+            if (count >= 3800) {
+                reporter.report("You have " + count + " selectors. Internet Explorer supports a maximum of 4095 selectors per stylesheet. Consider refactoring.",0,0,rule); 
+            }
         });
-	}
+    }
 
 });

src/rules/selector-max.js

@@ -6,24 +6,23 @@ CSSLint.addRule({
 
     //rule information
     id: "selector-max",
-    name: "Error when past the 4095 limit for IE",
+    name: "Error when past the 4095 selector limit for IE",
     desc: "Will error when selector count is > 4095.",
     browsers: "IE",
 
     //initialization
     init: function(parser, reporter){
-		var rule = this,
-			count = 0;
+        var rule = this, count = 0;
 
-		parser.addListener('startrule',function(event){
-			count++;
-		});
+        parser.addListener('startrule',function(event) {
+            count += event.selectors.length;
+        });
 
-		parser.addListener("endstylesheet", function(){
-			if(count>4095){
-				reporter.report("You have "+count+" rules. Internet Explorer supports a maximum of 4095 rules. All additional rules will be ignored by IE. Consider refactoring.",0,0,rule);	
-			}
-		});
-	}
+        parser.addListener("endstylesheet", function() {
+            if (count > 4095) {
+                reporter.report("You have " + count + " selectors. Internet Explorer supports a maximum of 4095 selectors per stylesheet. Consider refactoring.",0,0,rule); 
+            }
+        });
+    }
 
 });