diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2013-04-09 12:48:34 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2013-04-09 12:48:50 -0400 |
| commit | 738b8f84310f3d33d22fae976b83d94a684e01a8 (patch) | |
| tree | 04635c0a92622220ad9c506442f481fea96a7c4a | |
| parent | 6bf2c3e49a7504ed88364a146992e00526497dcd (diff) | |
| download | jquery-738b8f84310f3d33d22fae976b83d94a684e01a8.tar.gz jquery-738b8f84310f3d33d22fae976b83d94a684e01a8.zip | |
Add onevar to jshintrc, but remove the option for linting the concatenated file
| -rw-r--r-- | Gruntfile.js | 11 | ||||
| -rw-r--r-- | src/.jshintrc | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index a48639482..5f3a02c2c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -14,7 +14,12 @@ module.exports = function( grunt ) { data = grunt.file.readJSON( filepath ); } catch(e) {} return data; - }; + }, + srcHintOptions = readOptionalJSON("src/.jshintrc"); + + // The concatenated file won't pass onevar + // But our modules can + delete srcHintOptions.onevar; grunt.initConfig({ pkg: grunt.file.readJSON("package.json"), @@ -72,9 +77,7 @@ module.exports = function( grunt ) { jshint: { dist: { src: [ "dist/jquery.js" ], - options: { - jshintrc: "src/.jshintrc" - } + options: srcHintOptions }, grunt: { src: [ "Gruntfile.js" ], diff --git a/src/.jshintrc b/src/.jshintrc index d0fa23aae..a157a55f2 100644 --- a/src/.jshintrc +++ b/src/.jshintrc @@ -6,6 +6,7 @@ "expr": true, "immed": true, "noarg": true, + "onevar": true, "quotmark": "double", "smarttabs": true, "trailing": true, |