Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2015-08-25 19:19:24 +0300
committerXhmikosR <xhmikosr@gmail.com>2015-08-27 08:11:11 +0300
commit13e33e329c724b43e3abbed6522d0498970f74e1 (patch)
tree98026b23e3b10da381df2fa8b441ccad54da0bc6
parent97f0da32398175a78ec1d7d3b887cc4c1337d251 (diff)
Remove the obsolete JSHint references.
-rw-r--r--docs/assets/js/ie-emulation-modes-warning.js2
-rw-r--r--docs/getting-started/build-tools.md2
-rw-r--r--grunt/.jshintrc7
-rw-r--r--js/tests/unit/.jshintrc6
-rw-r--r--package.js1
-rw-r--r--package.json1
6 files changed, 2 insertions, 17 deletions
diff --git a/docs/assets/js/ie-emulation-modes-warning.js b/docs/assets/js/ie-emulation-modes-warning.js
index 3f97ba58bd..2016da6d54 100644
--- a/docs/assets/js/ie-emulation-modes-warning.js
+++ b/docs/assets/js/ie-emulation-modes-warning.js
@@ -25,7 +25,7 @@
// Detects the actual version of IE in use, even if it's in an older-IE emulation mode.
// IE JavaScript conditional compilation docs: https://msdn.microsoft.com/library/121hztk3%28v=vs.94%29.aspx
// @cc_on docs: https://msdn.microsoft.com/library/8ka90k2e%28v=vs.94%29.aspx
- var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')() // jshint ignore:line
+ var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')()
if (jscriptVersion === undefined) {
return 11 // IE11+ not in emulation mode
}
diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md
index 04cf5b7a06..adda6cbb16 100644
--- a/docs/getting-started/build-tools.md
+++ b/docs/getting-started/build-tools.md
@@ -28,7 +28,7 @@ Our Gruntfile includes the following commands and tasks:
| --- | --- |
| `grunt` | Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Sass](http://sass-lang.com/) and [UglifyJS](http://lisperator.net/uglifyjs/).** |
| `grunt dist` | `grunt dist` creates the `/dist` directory with compiled files. **Uses [Sass](http://sass-lang.com/) and [UglifyJS](http://lisperator.net/uglifyjs/).** |
-| `grunt test` | Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). |
+| `grunt test` | Runs [scss-lint](https://github.com/brigade/scss-lint), [ESLint](http://eslint.org/) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). |
| `grunt docs` | Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via `jekyll serve`. |
| `grunt watch` | This is a convenience method for watching just Sass files and automatically building them whenever you save. |
diff --git a/grunt/.jshintrc b/grunt/.jshintrc
deleted file mode 100644
index 0ea0495e9a..0000000000
--- a/grunt/.jshintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "extends" : "../js/.jshintrc",
- "asi" : false,
- "browser" : false,
- "es3" : false,
- "node" : true
-}
diff --git a/js/tests/unit/.jshintrc b/js/tests/unit/.jshintrc
deleted file mode 100644
index 22e878512b..0000000000
--- a/js/tests/unit/.jshintrc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "extends" : "../../.jshintrc",
- "devel" : true,
- "es3" : false,
- "qunit" : true
-}
diff --git a/package.js b/package.js
index 0a19795151..a1a9df1e9b 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,5 @@
// package metadata file for Meteor.js
-/* jshint strict:false */
/* global Package:true */
Package.describe({
diff --git a/package.json b/package.json
index eded9e2b45..07018beb9d 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
"grunt-contrib-csslint": "~0.4.0",
"grunt-contrib-cssmin": "~0.12.2",
"grunt-contrib-jade": "~0.14.1",
- "grunt-contrib-jshint": "~0.11.0",
"grunt-contrib-qunit": "~0.5.2",
"grunt-contrib-sass": "^0.8.1",
"grunt-contrib-uglify": "~0.8.0",