Merge branch 'master' of github.com:stubbornella/csslint

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/compatible-vendor-prefixes.js

@@ -42,7 +42,7 @@ CSSLint.addRule({
             "border-end-style"           : "webkit moz",
             "border-end-width"           : "webkit moz",
             "border-image"               : "webkit moz o",
-            "border-radius"              : "webkit moz",
+            "border-radius"              : "webkit",
             "border-start"               : "webkit moz",
             "border-start-color"         : "webkit moz",
             "border-start-style"         : "webkit moz",

src/rules/fallback-colors.js

@@ -15,7 +15,17 @@ CSSLint.addRule({
             propertiesToCheck = {
                 color: 1,
                 background: 1,
-                "background-color": 1                
+                "border-color": 1,
+                "border-top-color": 1,
+                "border-right-color": 1,
+                "border-bottom-color": 1,
+                "border-left-color": 1,
+                border: 1,
+                "border-top": 1,
+                "border-right": 1,
+                "border-bottom": 1,
+                "border-left": 1,
+                "background-color": 1
             },
             properties;
 

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); 
+            }
+        });
+    }
 
 });

tests/rules/compatible-vendor-prefixes.js

@@ -7,13 +7,9 @@
 
         name: "Compatible Vendor Prefix Warnings",
 
-        "Using -webkit-border-radius should warn to also include -moz-border-radius.": function(){
+        "Using -webkit-border-radius should not warn to also include -moz-border-radius.": function(){
             var result = CSSLint.verify("h1 { -webkit-border-radius: 5px; }", { "compatible-vendor-prefixes": 1 });
-            Assert.areEqual(1, result.messages.length);
-            Assert.areEqual("warning", result.messages[0].type);
-            Assert.areEqual("The property -moz-border-radius is compatible with -webkit-border-radius and should be included as well.", result.messages[0].message);
-            Assert.areEqual(6, result.messages[0].col);
-            Assert.areEqual(1, result.messages[0].line);
+            Assert.areEqual(0, result.messages.length);
         },
 
         "Using -webkit-transition and -moz-transition should warn to also include -o-transition.": function() {