Skip to content

Commit

Permalink
Rework of the JSCS and JSHint configs
Browse files Browse the repository at this point in the history
Those are stricter now, especially the JSCS. I believe it will make our code easier to read in the end.
It'll take some time to comply to it, so we'll do it gradually as we modify things.
  • Loading branch information
Hyzual committed Jul 7, 2015
1 parent b4ab303 commit 710b161
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 35 deletions.
46 changes: 40 additions & 6 deletions .jscsrc
@@ -1,10 +1,44 @@
{
"disallowSpacesInFunctionDeclaration": {
"beforeOpeningRoundBrace": true
},
"disallowEmptyBlocks": true,
"disallowImplicitTypeConversion": ["numeric", "boolean", "binary", "string"],
"disallowKeywordsOnNewLine": ["else"],
"disallowMixedSpacesAndTabs": true,
"disallowMultipleLineStrings": true,
"disallowNamedUnassignedFunctions": true,
"disallowNewlineBeforeBlockStatements": true,
"disallowOperatorBeforeLineBreak": ["+", "."],
"disallowQuotedKeysInObjects": "allButReserved",
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+","-", "~"],
"disallowSpaceBeforePostfixUnaryOperators": true,
"disallowSpacesInCallExpression": true,
"disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true },
"disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideParentheses": true,
"disallowTrailingComma": true,
"requireBlocksOnNewline": 1,
"requireCapitalizedConstructors": true,
"requireCommaBeforeLineBreak": true,
"requireCurlyBraces": ["if","else","for","while","do","try","catch"],
"requireDotNotation": true,
"requireLineBreakAfterVariableAssignment": true,
"requireParenthesesAroundIIFE": true,
"requireSemicolons": true,
"requireSpaceAfterBinaryOperators": true,
"requireSpaceAfterKeywords": ["do", "for", "if", "else", "switch", "case", "try", "catch", "void", "while", "with", "return", "typeof"],
"requireSpaceAfterLineComment": true,
"requireSpaceAfterPrefixUnaryOperators": ["!"],
"requireSpaceBeforeBinaryOperators": true,
"requireSpaceBeforeBlockStatements": true,
"requireSpacesInAnonymousFunctionExpression": {
"beforeOpeningRoundBrace": true
}
"requireSpaceBeforeKeywords": ["else", "catch", "while"],
"requireSpaceBeforeObjectValues": true,
"requireSpaceBetweenArguments": true,
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
"requireSpacesInConditionalExpression": true,
"requireSpacesInForStatement": true,
"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
"requireSpacesInsideObjectBrackets": { "allExcept": ["]"] },
"safeContextKeyword": ["self"],
"validateNewlineAfterArrayElements": { "maximum": 4, "ignoreBrackets": true },
"validateQuoteMarks": true
}
68 changes: 39 additions & 29 deletions .jshintrc
@@ -1,31 +1,41 @@
{
"bitwise": true,
"curly": true,
"eqeqeq": true,
"esnext": true,
"freeze": true,
"noarg": true,
"nonbsp": true,
"nonew": true,
"notypeof": true,
"shadow": false,
"strict": true,
"undef": true,
"unused": true,
"globals": {
"_": false,
"affix": false,
"after": false,
"angular": false,
"before": false,
"browser": false,
"console": false,
"expect": false,
"inject": false,
"installPromiseMatchers": false,
"module": false
},
"browser": true,
"jquery": true,
"jasmine": true
"bitwise": true,
"boss": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"esnext": true,
"forin": true,
"freeze": true,
"latedef": "nofunc",
"newcap": true,
"noarg": true,
"nonbsp": true,
"nonew": true,
"shadow": false,
"strict": true,
"sub": true,
"undef": true,
"unused": true,
"globals": {
/* angular.js */
"angular": false,
"inject": false,
"module": false,
/* protractor.js */
"browser": false,
"by": false,
"element": false,
/* jasmine-fixtures */
"affix": false,
/* jasmine-promise-matchers */
"installPromiseMatchers": false,
/* lodash */
"_": false
},
// environments
"browser": true,
"devel": true,
"jasmine": true,
"jquery": true
}

0 comments on commit 710b161

Please sign in to comment.