aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-05-30 23:59:23 -0700
committerChris Rebert <[email protected]>2016-05-30 23:59:24 -0700
commit00a3e1d9adfe0d7fc5a2e9ef2e529a1095de55d2 (patch)
treed242b876ebcf40f1b6282d0280dcf7af84dc972d
parentd8e118057d4fea699089a984fbfb147135756c8f (diff)
downloadbootstrap-00a3e1d9adfe0d7fc5a2e9ef2e529a1095de55d2.tar.xz
bootstrap-00a3e1d9adfe0d7fc5a2e9ef2e529a1095de55d2.zip
Upgrade ESLint to v1.9.0
Refs #19908
-rw-r--r--js/.eslintrc3
-rw-r--r--package.json2
2 files changed, 3 insertions, 2 deletions
diff --git a/js/.eslintrc b/js/.eslintrc
index 813cd29a3..619df7cb3 100644
--- a/js/.eslintrc
+++ b/js/.eslintrc
@@ -30,7 +30,6 @@
"no-inner-declarations": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
- "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}],
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-regex-spaces": 2,
@@ -53,6 +52,7 @@
"guard-for-in": 2,
"no-alert": 2,
"no-caller": 2,
+ "no-case-declarations": 2,
"no-div-regex": 2,
"no-else-return": 2,
"no-empty-label": 2,
@@ -69,6 +69,7 @@
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
+ "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}],
"no-multi-spaces": 0,
"no-multi-str": 2,
"no-native-reassign": 2,
diff --git a/package.json b/package.json
index c7d0d9538..d358bb866 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"devDependencies": {
"autoprefixer": "^6.0.3",
"babel-eslint": "^4.1.3",
- "eslint": "^1.7.3",
+ "eslint": "^1.9.0",
"grunt": "^0.4.5",
"grunt-babel": "^5.0.3",
"grunt-build-control": "^0.6.0",