Tweak JSHint and JSCS checks.

Be more consistent across the whole codebase.

Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.

diff --git a/Gruntfile.js b/Gruntfile.js
index 641fa2badba578ca8ff32a3bdb99da9d7a0ff5b2..c669725ea4f4da56318056556483530f352b3106 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -53,6 +53,9 @@ module.exports = function (grunt) {
         src: 'js/*.js'
       },
       test: {
+        options: {
+          jshintrc: 'js/tests/unit/.jshintrc'
+        },
         src: 'js/tests/unit/*.js'
       },
       assets: {
@@ -65,10 +68,6 @@ module.exports = function (grunt) {
         config: 'js/.jscsrc'
       },
       grunt: {
-        options: {
-          requireCamelCaseOrUpperCaseIdentifiers: null,
-          requireParenthesesAroundIIFE: true
-        },
         src: '<%= jshint.grunt.src %>'
       },
       src: {

diff --git a/grunt/.jshintrc b/grunt/.jshintrc
index d9dce889b11e5dd885a1adc6384c3275ee7d2062..78df94b9bca9a446b8533cea13c845bc748d85fa 100644 (file)
--- a/grunt/.jshintrc
+++ b/grunt/.jshintrc
@@ -1,11 +1,6 @@
 {
-  "curly" : true,
-  "eqeqeq": true,
-  "newcap": true,
-  "noarg" : true,
-  "node"  : true,
-  "nonbsp": true,
-  "strict": true,
-  "undef" : true,
-  "unused": true
+  "extends" : "../js/.jshintrc",
+  "browser" : false,
+  "es3"     : false,
+  "node"    : true
 }

diff --git a/js/.jscsrc b/js/.jscsrc
index 6725ce89d64f141e6ab369e9a584905ddcced349..fb6cd10c23ef599b0382891053bf81a062f47f10 100644 (file)
--- a/js/.jscsrc
+++ b/js/.jscsrc
@@ -1,16 +1,22 @@
 {
   "disallowEmptyBlocks": true,
   "disallowKeywords": ["with"],
-  "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+  "disallowLeftStickedOperators": ["?", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "disallowMixedSpacesAndTabs": true,
   "disallowMultipleLineStrings": true,
+  "disallowMultipleVarDecl": true,
   "disallowQuotedKeysInObjects": "allButReserved",
   "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+  "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
+  "disallowSpacesInsideArrayBrackets": true,
+  "disallowSpacesInsideParentheses": true,
+  "disallowTrailingComma": true,
   "disallowTrailingWhitespace": true,
   "requireCamelCaseOrUpperCaseIdentifiers": true,
   "requireCapitalizedConstructors": true,
+  "requireCommaBeforeLineBreak": true,
   "requireDotNotation": true,
   "requireLeftStickedOperators": [","],
   "requireLineFeedAtFileEnd": true,
@@ -18,10 +24,11 @@
   "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
   "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
   "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
-  "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true },
+  "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
   "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
   "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
   "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
+  "requireSpacesInsideObjectBrackets": "allButNested",
   "validateIndentation": 2,
   "validateLineBreaks": "LF",
   "validateQuoteMarks": "'"

diff --git a/js/.jshintrc b/js/.jshintrc
index c6104dc931347b5de85f663307df64e18e736fcc..a59e1d00a1136c3e14693ea08af584c601aa5bc0 100644 (file)
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -1,13 +1,15 @@
 {
   "asi"      : true,
-  "boss"     : true,
   "browser"  : true,
-  "debug"    : true,
-  "devel"    : true,
   "eqeqeq"   : false,
   "eqnull"   : true,
+  "es3"      : true,
   "expr"     : true,
+  "jquery"   : true,
+  "latedef"  : true,
   "laxbreak" : true,
-  "unused"   : true,
-  "validthis": true
+  "nonbsp"   : true,
+  "strict"   : true,
+  "undef"    : true,
+  "unused"   : true
 }

diff --git a/js/tests/unit/.jshintrc b/js/tests/unit/.jshintrc
new file mode 100644 (file)
index 0000000..682a49a
--- /dev/null
+++ b/js/tests/unit/.jshintrc
@@ -0,0 +1,5 @@
+{
+  "extends" : "../../.jshintrc",
+  "devel"   : true,
+  "qunit"   : true
+}

diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js
index cd184c2f4c4230389da033d61518c9b18a6c91a6..b5f0c67a67adf879b3b0511f147906434d074449 100644 (file)
--- a/js/tests/unit/phantom.js
+++ b/js/tests/unit/phantom.js
@@ -6,7 +6,6 @@
  * Licensed under the MIT license.
  */
 
-/*global QUnit:true, alert:true*/
 (function () {
   'use strict';