Skip to content

Commit 5ef9383

Browse files
committed
Tweak JSHint and JSCS checks.
Be more consistent across the whole codebase. Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
1 parent a8641b4 commit 5ef9383

File tree

6 files changed

+28
-21
lines changed

6 files changed

+28
-21
lines changed

Gruntfile.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ module.exports = function (grunt) {
5353
src: 'js/*.js'
5454
},
5555
test: {
56+
options: {
57+
jshintrc: 'js/tests/unit/.jshintrc'
58+
},
5659
src: 'js/tests/unit/*.js'
5760
},
5861
assets: {
@@ -65,10 +68,6 @@ module.exports = function (grunt) {
6568
config: 'js/.jscsrc'
6669
},
6770
grunt: {
68-
options: {
69-
requireCamelCaseOrUpperCaseIdentifiers: null,
70-
requireParenthesesAroundIIFE: true
71-
},
7271
src: '<%= jshint.grunt.src %>'
7372
},
7473
src: {

grunt/.jshintrc

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
2-
"curly" : true,
3-
"eqeqeq": true,
4-
"newcap": true,
5-
"noarg" : true,
6-
"node" : true,
7-
"nonbsp": true,
8-
"strict": true,
9-
"undef" : true,
10-
"unused": true
2+
"extends" : "../js/.jshintrc",
3+
"browser" : false,
4+
"es3" : false,
5+
"node" : true
116
}

js/.jscsrc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
11
{
22
"disallowEmptyBlocks": true,
33
"disallowKeywords": ["with"],
4-
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
4+
"disallowLeftStickedOperators": ["?", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
55
"disallowMixedSpacesAndTabs": true,
66
"disallowMultipleLineStrings": true,
7+
"disallowMultipleVarDecl": true,
78
"disallowQuotedKeysInObjects": "allButReserved",
89
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
910
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
1011
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
12+
"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
13+
"disallowSpacesInsideArrayBrackets": true,
14+
"disallowSpacesInsideParentheses": true,
15+
"disallowTrailingComma": true,
1116
"disallowTrailingWhitespace": true,
1217
"requireCamelCaseOrUpperCaseIdentifiers": true,
1318
"requireCapitalizedConstructors": true,
19+
"requireCommaBeforeLineBreak": true,
1420
"requireDotNotation": true,
1521
"requireLeftStickedOperators": [","],
1622
"requireLineFeedAtFileEnd": true,
1723
"requireRightStickedOperators": ["!"],
1824
"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
1925
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
2026
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
21-
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true },
27+
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
2228
"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
2329
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
2430
"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
31+
"requireSpacesInsideObjectBrackets": "allButNested",
2532
"validateIndentation": 2,
2633
"validateLineBreaks": "LF",
2734
"validateQuoteMarks": "'"

js/.jshintrc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
{
22
"asi" : true,
3-
"boss" : true,
43
"browser" : true,
5-
"debug" : true,
6-
"devel" : true,
74
"eqeqeq" : false,
85
"eqnull" : true,
6+
"es3" : true,
97
"expr" : true,
8+
"jquery" : true,
9+
"latedef" : true,
1010
"laxbreak" : true,
11-
"unused" : true,
12-
"validthis": true
11+
"nonbsp" : true,
12+
"strict" : true,
13+
"undef" : true,
14+
"unused" : true
1315
}

js/tests/unit/.jshintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"extends" : "../../.jshintrc",
3+
"devel" : true,
4+
"qunit" : true
5+
}

js/tests/unit/phantom.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Licensed under the MIT license.
77
*/
88

9-
/*global QUnit:true, alert:true*/
109
(function () {
1110
'use strict';
1211

0 commit comments

Comments
 (0)