diff options
| author | Chris Rebert <[email protected]> | 2014-02-07 09:36:39 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-02-07 09:36:39 -0800 |
| commit | 532f1d909724ca4c18a876e0bb7ee44f4d94c537 (patch) | |
| tree | 34f2149d91dc58326aa4797266c61ad04b343e2c | |
| parent | 442043e77568c13bcb5a674d4c271bdc30714a71 (diff) | |
| parent | aead10fafa12c2bf197c2cb4ea3b3055fcc191f0 (diff) | |
| download | bootstrap-532f1d909724ca4c18a876e0bb7ee44f4d94c537.tar.xz bootstrap-532f1d909724ca4c18a876e0bb7ee44f4d94c537.zip | |
Merge pull request #12636 from ZDroid/grunt-jshintrc
Avoid setting `jshint node: true` in every Grunt JS file
| -rw-r--r-- | Gruntfile.js | 3 | ||||
| -rw-r--r-- | docs/assets/js/customizer.js | 2 | ||||
| -rw-r--r-- | grunt/bs-glyphicons-data-generator.js | 1 | ||||
| -rw-r--r-- | grunt/bs-lessdoc-parser.js | 1 | ||||
| -rw-r--r-- | grunt/bs-raw-files-generator.js | 1 | ||||
| -rw-r--r-- | grunt/shrinkwrap.js | 2 |
6 files changed, 4 insertions, 6 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index c4da304dd..ac3107fd4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -44,6 +44,9 @@ module.exports = function (grunt) { jshintrc: 'js/.jshintrc' }, grunt: { + options: { + node: true + }, src: ['Gruntfile.js', 'grunt/*.js'] }, src: { diff --git a/docs/assets/js/customizer.js b/docs/assets/js/customizer.js index 405d87572..d165c4a02 100644 --- a/docs/assets/js/customizer.js +++ b/docs/assets/js/customizer.js @@ -6,7 +6,7 @@ * details, see http://creativecommons.org/licenses/by/3.0/. */ -/* jshint multistr:true */ +/* jshint multistr: true */ window.onload = function () { // wait for load in a dumb way because B-0 var cw = '/*!\n' + diff --git a/grunt/bs-glyphicons-data-generator.js b/grunt/bs-glyphicons-data-generator.js index 3e32698a1..9e4317f6f 100644 --- a/grunt/bs-glyphicons-data-generator.js +++ b/grunt/bs-glyphicons-data-generator.js @@ -1,4 +1,3 @@ -/* jshint node: true */ /*! * Bootstrap Grunt task for Glyphicons data generation * http://getbootstrap.com diff --git a/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js index 9d0b2ffaf..0433e6175 100644 --- a/grunt/bs-lessdoc-parser.js +++ b/grunt/bs-lessdoc-parser.js @@ -1,4 +1,3 @@ -/* jshint node: true */ /*! * Bootstrap Grunt task for parsing Less docstrings * http://getbootstrap.com diff --git a/grunt/bs-raw-files-generator.js b/grunt/bs-raw-files-generator.js index 8f004ce3e..bc005a422 100644 --- a/grunt/bs-raw-files-generator.js +++ b/grunt/bs-raw-files-generator.js @@ -1,4 +1,3 @@ -/* jshint node: true */ /* global btoa: true */ /*! diff --git a/grunt/shrinkwrap.js b/grunt/shrinkwrap.js index 7a0328d41..f486bc69b 100644 --- a/grunt/shrinkwrap.js +++ b/grunt/shrinkwrap.js @@ -1,5 +1,3 @@ -/* jshint node: true */ - /* This Grunt task updates the npm-shrinkwrap.canonical.json file that's used as the key for Bootstrap's npm packages cache. This task should be run and the updated file should be committed whenever Bootstrap's dependencies change. |