aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-14 13:23:25 -0800
committerMark Otto <[email protected]>2013-12-14 13:23:25 -0800
commit85316c8a0c012b2607b184248dce60a5bd535a4b (patch)
tree9ce23cee0ac96098e78c8700d75403673933b2ef
parent11c6ab767cab5384188a301f7c9366b212432e81 (diff)
parent9e50078321984b4c166c35dd1be7d98151219017 (diff)
downloadbootstrap-85316c8a0c012b2607b184248dce60a5bd535a4b.tar.xz
bootstrap-85316c8a0c012b2607b184248dce60a5bd535a4b.zip
Merge branch 'master' of github.com:twbs/bootstrap
-rw-r--r--js/.jscs.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/.jscs.json b/js/.jscs.json
index 2f04d9cd6..e02344fd5 100644
--- a/js/.jscs.json
+++ b/js/.jscs.json
@@ -1,5 +1,5 @@
{
- "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return"],
+ "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": ["!"],