diff options
| author | Mark Otto <[email protected]> | 2013-12-22 22:31:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-22 22:31:28 -0800 |
| commit | 6fda30e1c4532f639ae3cfe3921ea6cfb143e11b (patch) | |
| tree | 7993782818caaaae63cf15da5ea402083fb6b029 /js | |
| parent | 9fc0e20381ec06bc85c68a5e6f1f2a5103a3267a (diff) | |
| parent | 45a8a9508ed8c2cced5e8ce0b21ef3fd11fe6e15 (diff) | |
| download | bootstrap-6fda30e1c4532f639ae3cfe3921ea6cfb143e11b.tar.xz bootstrap-6fda30e1c4532f639ae3cfe3921ea6cfb143e11b.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'js')
| -rw-r--r-- | js/.jscs.json | 14 | ||||
| -rw-r--r-- | js/.jshintrc | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/js/.jscs.json b/js/.jscs.json index e8210ccde..c4cac13de 100644 --- a/js/.jscs.json +++ b/js/.jscs.json @@ -1,15 +1,15 @@ { - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], - "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "disallowKeywords": ["with"], "requireLeftStickedOperators": [","], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], - "requireRightStickedOperators": ["!"], "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireLineFeedAtFileEnd": true, + "requireRightStickedOperators": ["!"], "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - "disallowKeywords": ["with"], - "validateLineBreaks": "LF", - "requireLineFeedAtFileEnd": true + "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], + "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "validateLineBreaks": "LF" } diff --git a/js/.jshintrc b/js/.jshintrc index c8cccda37..ab4dfdfc9 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -9,7 +9,6 @@ "eqnull" : true, "expr" : true, "laxbreak" : true, - "laxcomma" : true, "quotmark" : "single", "validthis": true }
\ No newline at end of file |