aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-03-06 13:10:40 -0800
committerChris Rebert <[email protected]>2014-03-06 13:15:32 -0800
commit310465b035353e05524a998dc29605252dc976e7 (patch)
treefbca3ac29832b31116c10d56cceb2bdaf6bc8aef
parentdec1c21e34d12493b1eb82c8659635e068d8919d (diff)
downloadbootstrap-310465b035353e05524a998dc29605252dc976e7.tar.xz
bootstrap-310465b035353e05524a998dc29605252dc976e7.zip
re-enable requireCamelCaseOrUpperCaseIdentifiers in JSCS & use `null` to override it for Gruntfile
-rw-r--r--Gruntfile.js1
-rw-r--r--js/.jscsrc1
2 files changed, 2 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 0d7d0b68d..8afc650d8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -66,6 +66,7 @@ module.exports = function (grunt) {
},
grunt: {
options: {
+ 'requireCamelCaseOrUpperCaseIdentifiers': null,
'requireParenthesesAroundIIFE': true
},
src: '<%= jshint.grunt.src %>'
diff --git a/js/.jscsrc b/js/.jscsrc
index 3ce1db5fc..2da777a22 100644
--- a/js/.jscsrc
+++ b/js/.jscsrc
@@ -8,6 +8,7 @@
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowTrailingWhitespace": true,
+ "requireCamelCaseOrUpperCaseIdentifiers": true,
"requireLeftStickedOperators": [","],
"requireLineFeedAtFileEnd": true,
"requireRightStickedOperators": ["!"],