diff options
| author | Mark Otto <[email protected]> | 2015-08-25 00:27:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-25 00:27:44 -0700 |
| commit | ebc0a56c6f66b189665f2d7ff1c947bfeaf3a677 (patch) | |
| tree | f7e3d51437eed46ccbded361166335d7d48aa27a /js | |
| parent | facb3a0c3c3f240ae4490019639cf2d6bc2eb53f (diff) | |
| parent | 37b00133ae9da22b58865c1ecab6af2e075a5e25 (diff) | |
| download | bootstrap-ebc0a56c6f66b189665f2d7ff1c947bfeaf3a677.tar.xz bootstrap-ebc0a56c6f66b189665f2d7ff1c947bfeaf3a677.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'js')
| -rw-r--r-- | js/.eslintrc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/js/.eslintrc b/js/.eslintrc index b21ede35a..33b23f245 100644 --- a/js/.eslintrc +++ b/js/.eslintrc @@ -15,8 +15,8 @@ "no-dupe-args": 2, "no-dupe-keys": 2, "no-duplicate-case": 2, - "no-empty-character-class": 2, "no-empty": 2, + "no-empty-character-class": 2, "no-ex-assign": 2, "no-extra-boolean-cast": 2, "no-extra-parens": 0, @@ -29,11 +29,11 @@ "no-obj-calls": 2, "no-regex-spaces": 2, "no-sparse-arrays": 2, + "no-unexpected-multiline": 2, "no-unreachable": 2, "use-isnan": 2, "valid-jsdoc": 0, "valid-typeof": 2, - "no-unexpected-multiline": 2, //Best Practices "accessor-pairs": 2, @@ -41,8 +41,8 @@ "consistent-return": 2, "curly": 2, "default-case": 2, - "dot-notation": 0, "dot-location": 0, + "dot-notation": 0, "eqeqeq": 2, "guard-for-in": 2, "no-alert": 2, @@ -66,11 +66,11 @@ "no-multi-spaces": 0, "no-multi-str": 0, "no-native-reassign": 2, + "no-new": 2, "no-new-func": 0, "no-new-wrappers": 2, - "no-new": 2, - "no-octal-escape": 2, "no-octal": 2, + "no-octal-escape": 2, "no-param-reassign": 0, "no-process-env": 2, "no-proto": 2, @@ -95,11 +95,11 @@ "no-catch-shadow": 2, "no-delete-var": 2, "no-label-var": 2, - "no-shadow-restricted-names": 2, "no-shadow": 0, - "no-undef-init": 2, + "no-shadow-restricted-names": 2, "no-undef": 0, "no-undefined": 0, + "no-undef-init": 2, "no-unused-vars": 2, "no-use-before-define": 0, @@ -117,11 +117,11 @@ "func-style": 0, "indent": 0, "key-spacing": 0, - "lines-around-comment": 0, "linebreak-style": 2, + "lines-around-comment": 0, "new-cap": 0, - "new-parens": 2, "newline-after-var": 0, + "new-parens": 2, "no-array-constructor": 2, "no-continue": 0, "no-inline-comments": 0, @@ -142,17 +142,17 @@ "padded-blocks": 0, "quote-props": 0, "quotes": 0, - "semi-spacing": 0, "semi": [2, "never"], + "semi-spacing": 0, "sort-vars": 2, "space-after-keywords": 2, "space-before-blocks": 2, "space-before-function-paren": 0, - "space-in-parens": 2, + "spaced-comment": 2, "space-infix-ops": 2, + "space-in-parens": 2, "space-return-throw-case": 2, "space-unary-ops": 2, - "spaced-comment": 2, // es6 "arrow-parens": 2, @@ -167,8 +167,8 @@ "object-shorthand": 2, "prefer-arrow-callback": 2, "prefer-const": 0, - "prefer-spread": 2, "prefer-reflect": 0, + "prefer-spread": 2, "prefer-template": 2, "require-yield": 2 |