Merge pull request #484 from XhmikosR/quotmark

nschonni · nschonni · commit 9feb5f622e00 · 2014-04-09T16:01:06.000-04:00
Enable JSHint's `quotmark` rule.
diff --git a/.jshintrc b/.jshintrc
@@ -9,6 +9,7 @@
     "noarg": true,
     "noempty": true,
     "nonbsp": true,
+    "quotmark": "double",
     "undef": true,
     "globals": {
         "CSSLint": true,
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/src/cli/common.js b/src/cli/common.js
@@ -171,8 +171,8 @@ function cli(api){
      */
     function outputHelp(){
         var lenToPad = 40,
-            toPrint = '',
-            formatString = '';
+            toPrint = "",
+            formatString = "";
 
         api.print([
             "\nUsage: csslint-rhino.js [options]* [file|dir]*",
@@ -185,14 +185,14 @@ function cli(api){
                 // Print the option name and the format if present
                 toPrint += "  --" + optionName;
                 if (globalOptions[optionName].format !== "") {
-                    formatString = '=' + globalOptions[optionName].format;
+                    formatString = "=" + globalOptions[optionName].format;
                     toPrint += formatString;
                 } else {
-                    formatString = '';
+                    formatString = "";
                 }
 
                 // Pad out with the appropriate number of spaces
-                toPrint += new Array(lenToPad - (optionName.length + formatString.length)).join(' ');
+                toPrint += new Array(lenToPad - (optionName.length + formatString.length)).join(" ");
 
                 // Print the description
                 toPrint += globalOptions[optionName].description + "\n";
@@ -283,8 +283,8 @@ function cli(api){
 
     function validateOptions(options) {
         for (var option_key in options) {
-            if (!globalOptions.hasOwnProperty(option_key) && option_key !== 'files') {
-                api.print(option_key + ' is not a valid option. Exiting...');
+            if (!globalOptions.hasOwnProperty(option_key) && option_key !== "files") {
+                api.print(option_key + " is not a valid option. Exiting...");
                 outputHelp();
                 api.quit(0);
             }
diff --git a/src/core/CSSLint.js b/src/core/CSSLint.js
@@ -179,7 +179,7 @@ var CSSLint = (function(){
                                                 underscoreHack: true, strict: false });
 
         // normalize line endings
-        lines = text.replace(/\n\r?/g, "$split$").split('$split$');
+        lines = text.replace(/\n\r?/g, "$split$").split("$split$");
 
         if (!ruleset){
             ruleset = this.getRuleset();
diff --git a/src/formatters/checkstyle-xml.js b/src/formatters/checkstyle-xml.js
@@ -81,10 +81,10 @@
              * @return rule source as {String}
              */
             var generateSource = function(rule) {
-                if (!rule || !('name' in rule)) {
+                if (!rule || !("name" in rule)) {
                     return "";
                 }
-                return 'net.csslint.' + rule.name.replace(/\s/g,'');
+                return "net.csslint." + rule.name.replace(/\s/g,"");
             };
 
 
diff --git a/src/formatters/junit-xml.js b/src/formatters/junit-xml.js
@@ -31,8 +31,8 @@ CSSLint.addFormatter({
         var messages = results.messages,
             output = [],
             tests = {
-                'error': 0,
-                'failure': 0
+                "error": 0,
+                "failure": 0
             };
 
         /**
@@ -43,10 +43,10 @@ CSSLint.addFormatter({
          * @return rule source as {String}
          */
         var generateSource = function(rule) {
-            if (!rule || !('name' in rule)) {
+            if (!rule || !("name" in rule)) {
                 return "";
             }
-            return 'net.csslint.' + rule.name.replace(/\s/g,'');
+            return "net.csslint." + rule.name.replace(/\s/g,"");
         };
 
         /**
@@ -76,15 +76,15 @@ CSSLint.addFormatter({
 
                 // since junit has no warning class
                 // all issues as errors
-                var type = message.type === 'warning' ? 'error' : message.type;
+                var type = message.type === "warning" ? "error" : message.type;
 
                 //ignore rollups for now
                 if (!message.rollup) {
 
                     // build the test case seperately, once joined
                     // we'll add it to a custom array filtered by type
                     output.push("<testcase time=\"0\" name=\"" + generateSource(message.rule) + "\">");
-                    output.push("<" + type + " message=\"" + escapeSpecialCharacters(message.message) + "\"><![CDATA[" + message.line + ':' + message.col + ':' + escapeSpecialCharacters(message.evidence)  + "]]></" + type + ">");
+                    output.push("<" + type + " message=\"" + escapeSpecialCharacters(message.message) + "\"><![CDATA[" + message.line + ":" + message.col + ":" + escapeSpecialCharacters(message.evidence)  + "]]></" + type + ">");
                     output.push("</testcase>");
 
                     tests[type] += 1;
diff --git a/src/rules/bulletproof-font-face.js b/src/rules/bulletproof-font-face.js
@@ -39,7 +39,7 @@ CSSLint.addRule({
             col  = event.col;
 
             // This is the property that we care about, we can ignore the rest
-            if (propertyName === 'src') {
+            if (propertyName === "src") {
                 var regex = /^\s?url\(['"].+\.eot\?.*['"]\)\s*format\(['"]embedded-opentype['"]\).*$/i;
 
                 // We need to handle the advanced syntax with two src properties
diff --git a/src/rules/compatible-vendor-prefixes.js b/src/rules/compatible-vendor-prefixes.js
@@ -90,9 +90,9 @@ CSSLint.addRule({
         for (prop in compatiblePrefixes) {
             if (compatiblePrefixes.hasOwnProperty(prop)) {
                 variations = [];
-                prefixed = compatiblePrefixes[prop].split(' ');
+                prefixed = compatiblePrefixes[prop].split(" ");
                 for (i = 0, len = prefixed.length; i < len; i++) {
-                    variations.push('-' + prefixed[i] + '-' + prop);
+                    variations.push("-" + prefixed[i] + "-" + prop);
                 }
                 compatiblePrefixes[prop] = variations;
                 arrayPush.apply(applyTo, variations);
diff --git a/src/rules/duplicate-background-images.js b/src/rules/duplicate-background-images.js
@@ -22,8 +22,8 @@ CSSLint.addRule({
 
             if (name.match(/background/i)) {
                 for (i=0, len=value.parts.length; i < len; i++) {
-                    if (value.parts[i].type == 'uri') {
-                        if (typeof stack[value.parts[i].uri] === 'undefined') {
+                    if (value.parts[i].type == "uri") {
+                        if (typeof stack[value.parts[i].uri] === "undefined") {
                             stack[value.parts[i].uri] = event;
                         }
                         else {
diff --git a/src/rules/order-alphabetical.js b/src/rules/order-alphabetical.js
@@ -33,8 +33,8 @@ CSSLint.addRule({
         });
 
         parser.addListener("endrule", function(event){
-            var currentProperties = properties.join(','),
-                expectedProperties = properties.sort().join(',');
+            var currentProperties = properties.join(","),
+                expectedProperties = properties.sort().join(",");
 
             if (currentProperties !== expectedProperties){
                 reporter.report("Rule doesn't have all its properties in alphabetical ordered.", event.line, event.col, rule);
diff --git a/src/rules/selector-max-approaching.js b/src/rules/selector-max-approaching.js
@@ -14,7 +14,7 @@ CSSLint.addRule({
     init: function(parser, reporter) {
         var rule = this, count = 0;
 
-        parser.addListener('startrule', function(event) {
+        parser.addListener("startrule", function(event) {
             count += event.selectors.length;
         });
 
diff --git a/src/rules/selector-max.js b/src/rules/selector-max.js
@@ -14,7 +14,7 @@ CSSLint.addRule({
     init: function(parser, reporter){
         var rule = this, count = 0;
 
-        parser.addListener('startrule',function(event) {
+        parser.addListener("startrule", function(event) {
             count += event.selectors.length;
         });
 
diff --git a/tests/core/CSSLint.js b/tests/core/CSSLint.js
@@ -19,13 +19,13 @@
 
         "Embedded ruleset should be honored": function(){
             var result = CSSLint.verify("/*csslint bogus, adjoining-classes:true, box-sizing:false */\n.foo.bar{}", {
-                'text-indent': 1,
-                'box-sizing': 1
+                "text-indent": 1,
+                "box-sizing": 1
             });
 
-            Assert.areEqual(2, result.ruleset['adjoining-classes']);
-            Assert.areEqual(1, result.ruleset['text-indent']);
-            Assert.areEqual(0, result.ruleset['box-sizing']);
+            Assert.areEqual(2, result.ruleset["adjoining-classes"]);
+            Assert.areEqual(1, result.ruleset["text-indent"]);
+            Assert.areEqual(0, result.ruleset["box-sizing"]);
         }
 
     }));
diff --git a/tests/formatters/checkstyle-xml.js b/tests/formatters/checkstyle-xml.js
@@ -27,14 +27,14 @@
         },
 
         "Formatter should escape special characters": function() {
-            var specialCharsSting = 'sneaky, "sneaky", <sneaky>, sneak & sneaky',
+            var specialCharsSting = "sneaky, 'sneaky', <sneaky>, sneak & sneaky",
                 result = { messages: [
                 { type: "warning", line: 1, col: 1, message: specialCharsSting, evidence: "ALSO BOGUS", rule: [] },
                 { type: "error", line: 2, col: 1, message: specialCharsSting, evidence: "ALSO BOGUS", rule: [] }
             ], stats: [] },
                 file = "<file name=\"FILE\">",
-                error1 = "<error line=\"1\" column=\"1\" severity=\"warning\" message=\"sneaky, &quot;sneaky&quot;, &lt;sneaky&gt;, sneak &amp; sneaky\" source=\"\"/>",
-                error2 = "<error line=\"2\" column=\"1\" severity=\"error\" message=\"sneaky, &quot;sneaky&quot;, &lt;sneaky&gt;, sneak &amp; sneaky\" source=\"\"/>",
+                error1 = "<error line=\"1\" column=\"1\" severity=\"warning\" message=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\" source=\"\"/>",
+                error2 = "<error line=\"2\" column=\"1\" severity=\"error\" message=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\" source=\"\"/>",
                 expected = "<?xml version=\"1.0\" encoding=\"utf-8\"?><checkstyle>" + file + error1 + error2 + "</file></checkstyle>",
                 actual = CSSLint.format(result, "FILE", "checkstyle-xml");
             Assert.areEqual(expected, actual);
diff --git a/tests/formatters/compact.js b/tests/formatters/compact.js
@@ -20,8 +20,8 @@
 
         "File with problems should list them": function() {
             var result = { messages: [
-                { type: 'error', line: 2, col: 1, message: 'BOGUS ERROR', evidence: 'BOGUS', rule: { id: 'BOGUS_RULE_ID' } },
-                { type: 'warning', line: 1, col: 1, message: 'BOGUS WARNING', evidence: 'BOGUS', rule: { id: 'BOGUS_RULE_ID' } }
+                { type: "error", line: 2, col: 1, message: "BOGUS ERROR", evidence: "BOGUS", rule: { id: "BOGUS_RULE_ID" } },
+                { type: "warning", line: 1, col: 1, message: "BOGUS WARNING", evidence: "BOGUS", rule: { id: "BOGUS_RULE_ID" } }
             ], stats: [] },
                 err = "path/to/FILE: line 2, col 1, Error - BOGUS ERROR (BOGUS_RULE_ID)\n",
                 warning = "path/to/FILE: line 1, col 1, Warning - BOGUS WARNING (BOGUS_RULE_ID)\n",
@@ -32,8 +32,8 @@
 
         "Should output relative file paths": function() {
             var result = { messages: [
-                { type: 'error', line: 2, col: 1, message: 'BOGUS ERROR', evidence: 'BOGUS', rule: { id: 'BOGUS_RULE_ID' } },
-                { type: 'warning', line: 1, col: 1, message: 'BOGUS WARNING', evidence: 'BOGUS', rule: { id: 'BOGUS_RULE_ID' } }
+                { type: "error", line: 2, col: 1, message: "BOGUS ERROR", evidence: "BOGUS", rule: { id: "BOGUS_RULE_ID" } },
+                { type: "warning", line: 1, col: 1, message: "BOGUS WARNING", evidence: "BOGUS", rule: { id: "BOGUS_RULE_ID" } }
             ], stats: [] },
                 err = "path/to/FILE: line 2, col 1, Error - BOGUS ERROR (BOGUS_RULE_ID)\n",
                 warning = "path/to/FILE: line 1, col 1, Warning - BOGUS WARNING (BOGUS_RULE_ID)\n",
diff --git a/tests/formatters/csslint-xml.js b/tests/formatters/csslint-xml.js
@@ -26,7 +26,7 @@
         },
 
         "Formatter should escape double quotes": function() {
-            var doubleQuotedEvidence = 'sneaky, "sneaky", <sneaky>, sneak & sneaky',
+            var doubleQuotedEvidence = "sneaky, \"sneaky\", <sneaky>, sneak & sneaky",
                 result = { messages: [
                 { type: "warning", line: 1, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] },
                 { type: "error", line: 2, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] }
diff --git a/tests/formatters/junit-xml.js b/tests/formatters/junit-xml.js
@@ -34,7 +34,7 @@
 
         "Formatter should escape special characters": function() {
 
-            var specialCharsSting = 'sneaky, "sneaky", <sneaky>',
+            var specialCharsSting = "sneaky, 'sneaky', <sneaky>",
                 result = { messages: [
                 { type: "warning", line: 1, col: 1, message: specialCharsSting, evidence: "ALSO BOGUS", rule: [] },
                 { type: "error", line: 2, col: 1, message: specialCharsSting, evidence: "ALSO BOGUS", rule: [] }
diff --git a/tests/formatters/lint-xml.js b/tests/formatters/lint-xml.js
@@ -27,7 +27,7 @@
         },
 
         "Formatter should escape double quotes": function() {
-            var doubleQuotedEvidence = 'sneaky, "sneaky", <sneaky>, sneak & sneaky',
+            var doubleQuotedEvidence = "sneaky, \"sneaky\", <sneaky>, sneak & sneaky",
                 result = { messages: [
                 { type: "warning", line: 1, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] },
                 { type: "error", line: 2, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] }
diff --git a/tests/formatters/text.js b/tests/formatters/text.js
@@ -15,7 +15,7 @@
 
         "File with one problem should use proper grammar": function() {
             var result = { messages: [
-                     { type: 'warning', line: 1, col: 1, message: 'BOGUS', evidence: 'ALSO BOGUS', rule: [] }
+                     { type: "warning", line: 1, col: 1, message: "BOGUS", evidence: "ALSO BOGUS", rule: [] }
                 ], stats: [] },
                 error1 = "\n1: warning at line 1, col 1\nBOGUS\nALSO BOGUS",
                 expected = "\n\ncsslint: There is 1 problem in path/to/FILE.\n\nFILE" + error1,
@@ -31,8 +31,8 @@
 
         "File with problems should list them": function() {
             var result = { messages: [
-                { type: 'warning', line: 1, col: 1, message: 'BOGUS', evidence: 'ALSO BOGUS', rule: [] },
-                { type: 'error', line: 2, col: 1, message: 'BOGUS', evidence: 'ALSO BOGUS', rule: [] }
+                { type: "warning", line: 1, col: 1, message: "BOGUS", evidence: "ALSO BOGUS", rule: [] },
+                { type: "error", line: 2, col: 1, message: "BOGUS", evidence: "ALSO BOGUS", rule: [] }
             ], stats: [] },
                 error1 = "\n1: warning at line 1, col 1\nBOGUS\nALSO BOGUS",
                 error2 = "\n2: error at line 2, col 1\nBOGUS\nALSO BOGUS",
