aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-06-04 15:07:16 -0700
committerChris Rebert <[email protected]>2016-06-04 15:07:16 -0700
commitd1b8ec85e25a33c824c4eb211cb5638e98fd616f (patch)
treea6f754373a63af78107a623d74851bdc86f3c8f3 /js
parent1f5d8aa4b30475798f4fa4a4d0b607bd0771cb94 (diff)
downloadbootstrap-d1b8ec85e25a33c824c4eb211cb5638e98fd616f.tar.xz
bootstrap-d1b8ec85e25a33c824c4eb211cb5638e98fd616f.zip
Upgrade ESLint to v2.9.0 (#20047)
Refs #19908 [skip sauce] [skip validator]
Diffstat (limited to 'js')
-rw-r--r--js/.eslintrc.json4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index f64ef2e70..452cd2401 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -136,6 +136,7 @@
"keyword-spacing": "error",
"linebreak-style": "error",
"lines-around-comment": "off",
+ "max-statements-per-line": ["error", { "max": 1 }],
"new-cap": "off",
"newline-after-var": "off",
"new-parens": "error",
@@ -152,6 +153,8 @@
"no-trailing-spaces": "error",
"no-underscore-dangle": "off",
"no-unneeded-ternary": "error",
+ "no-unsafe-finally": "error",
+ "no-useless-computed-key": "error",
"object-curly-spacing": ["warn", "always"],
"one-var": "off",
"operator-assignment": "error",
@@ -168,7 +171,6 @@
"space-infix-ops": "error",
"space-in-parens": "error",
"space-unary-ops": "error",
- "max-statements-per-line": ["error", { "max": 1 }],
// es6
"arrow-parens": "error",