Clean up jshintrc configs. Close gh-983.

diff --git a/.jshintrc b/.jshintrc
index 1c2f7c2b0832967f697f51be9fbcafe5ba78038b..5ff1e697da661013aa64ccfa7375dcb77126b756 100644 (file)
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,12 +1,16 @@
 {
-  "curly": true,
-  "eqnull": true,
-  "eqeqeq": true,
-  "expr": true,
-  "latedef": true,
-  "noarg": true,
-  "quotmark": "double",
-  "smarttabs": true,
-  "trailing": true,
-  "undef": true
+  "options": {
+    "curly": true,
+    "eqeqeq": true,
+    "eqnull": true,
+    "expr": true,
+    "latedef": true,
+    "noarg": true,
+    "node": true,
+    "quotmark": "double",
+    "smarttabs": true,
+    "trailing": true,
+    "undef": true,
+    "unused": true
+  }
 }

diff --git a/grunt.js b/grunt.js
index 9138925d7b8c91e9cadd01b2e26a4b37ac60f27f..ff44d9f7007bead94c4076f9696f3e905923a8b3 100644 (file)
--- a/grunt.js
+++ b/grunt.js
@@ -5,9 +5,6 @@
  *
  */
 
-/*jshint node: true */
-/*global config:true, task:true, process:true*/
-
 module.exports = function( grunt ) {
 
        "use strict";
@@ -24,15 +21,10 @@ module.exports = function( grunt ) {
                return data;
        }
 
-       var task = grunt.task;
        var file = grunt.file;
-       var utils = grunt.utils;
        var log = grunt.log;
        var verbose = grunt.verbose;
-       var fail = grunt.fail;
-       var option = grunt.option;
        var config = grunt.config;
-       var template = grunt.template;
        var distpaths = [
                "dist/jquery.js",
                "dist/jquery.min.js"
@@ -99,7 +91,7 @@ module.exports = function( grunt ) {
                        }
 
                        return {
-                               options: jshintrc(),
+                               grunt: jshintrc(),
                                dist: jshintrc( "src/" ),
                                tests: jshintrc( "test/" )
                        };
@@ -260,8 +252,7 @@ module.exports = function( grunt ) {
                "Concatenate source (include/exclude modules with +/- flags), embed date/version",
                function() {
                        // Concat specified files.
-                       var i,
-                               compiled = "",
+                       var compiled = "",
                                modules = this.flags,
                                explicit = Object.keys(modules).length > 1,
                                optIn = !modules["*"],

diff --git a/src/.jshintrc b/src/.jshintrc
index d75461017cb76f7543236f2aba84a9d439742885..2ce0eca6f1c72889c5d83a76f617ecce932856f0 100644 (file)
--- a/src/.jshintrc
+++ b/src/.jshintrc
@@ -1,17 +1,17 @@
 {
   "options": {
-    "evil": true,
     "browser": true,
-    "wsh": true,
+    "curly": true,
     "eqnull": true,
+    "evil": true,
     "expr": true,
-    "curly": true,
-    "trailing": true,
-    "undef": true,
+    "maxerr": 100,
+    "quotmark": "double",
     "smarttabs": true,
     "sub": true,
-    "maxerr": 100,
-    "quotmark": "double"
+    "trailing": true,
+    "undef": true,
+    "wsh": true
   },
   "globals": {
     "define": true,

diff --git a/test/.jshintrc b/test/.jshintrc
index 9068558c4af21908cf72fb5687eae86d932f0dc3..11e1c0361435195bfc5c5e8cca5a5e00d0415875 100644 (file)
--- a/test/.jshintrc
+++ b/test/.jshintrc
@@ -1,17 +1,18 @@
 {
   "options": {
-    "evil": true,
     "browser": true,
-    "wsh": true,
+    "curly": true,
+    "devel": true,
     "eqnull": true,
+    "evil": true,
     "expr": true,
-    "curly": true,
-    "trailing": true,
-    "undef": true,
-    "smarttabs": true,
     "maxerr": 100,
+    "quotmark": "double",
+    "smarttabs": true,
     "sub": true,
-    "quotmark": "double"
+    "trailing": true,
+    "undef": true,
+    "wsh": true
   },
   "globals": {
     "define": true,
@@ -24,7 +25,6 @@
     "require": true,
     "file": true,
     "log": true,
-    "console": true,
     "QUnit": true,
     "ok": true,
     "equal": true,