aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2014-02-27 17:38:46 +0200
committerXhmikosR <[email protected]>2014-02-28 17:30:08 +0200
commit25450730247f4e77f30660f52762fa83e44d6fa1 (patch)
tree498f7342ff0870479524841d08cae30a95adb6bc
parentbe8f125ce6225222507f0b7329ea88b99207ac21 (diff)
downloadbootstrap-25450730247f4e77f30660f52762fa83e44d6fa1.tar.xz
bootstrap-25450730247f4e77f30660f52762fa83e44d6fa1.zip
Move `trailing` check to JSCS.
-rw-r--r--grunt/.jshintrc1
-rw-r--r--js/.jscsrc1
2 files changed, 1 insertions, 1 deletions
diff --git a/grunt/.jshintrc b/grunt/.jshintrc
index d357212cc..f79ed0cac 100644
--- a/grunt/.jshintrc
+++ b/grunt/.jshintrc
@@ -7,6 +7,5 @@
"node" : true,
"nonbsp" : true,
"strict" : true,
- "trailing" : true,
"undef" : true
}
diff --git a/js/.jscsrc b/js/.jscsrc
index ceaffbcd5..2da777a22 100644
--- a/js/.jscsrc
+++ b/js/.jscsrc
@@ -7,6 +7,7 @@
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+ "disallowTrailingWhitespace": true,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"requireLeftStickedOperators": [","],
"requireLineFeedAtFileEnd": true,