diff options
| author | Chris Rebert <[email protected]> | 2014-03-06 13:23:43 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-03-06 13:23:43 -0800 |
| commit | 4db5164dc66588401d96f8db20700f5b78c8019b (patch) | |
| tree | fbca3ac29832b31116c10d56cceb2bdaf6bc8aef | |
| parent | dec1c21e34d12493b1eb82c8659635e068d8919d (diff) | |
| parent | 310465b035353e05524a998dc29605252dc976e7 (diff) | |
| download | bootstrap-4db5164dc66588401d96f8db20700f5b78c8019b.tar.xz bootstrap-4db5164dc66588401d96f8db20700f5b78c8019b.zip | |
Merge pull request #12950 from twbs/jscs-null-trick
re-enable requireCamelCaseOrUpperCaseIdentifiers in JSCS
| -rw-r--r-- | Gruntfile.js | 1 | ||||
| -rw-r--r-- | js/.jscsrc | 1 |
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": ["!"], |