Skip to content

Commit

Permalink
Bump JSCS version, add JSCS rules and fix a style violation
Browse files Browse the repository at this point in the history
  • Loading branch information
astorije committed Nov 6, 2015
1 parent 5b57a60 commit 6c12491
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .jscs.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
"disallowImplicitTypeConversion": ["numeric", "boolean", "binary", "string"],
"disallowKeywords": ["with", "eval"],
"disallowMixedSpacesAndTabs": true,
"disallowMultiLineTernary": true,
"disallowMultipleLineBreaks": true,
"disallowMultipleLineStrings": true,
"disallowMultipleSpaces": true,
"disallowMultipleVarDecl": "strict",
"disallowNestedTernaries": true,
"disallowNewlineBeforeBlockStatements": true,
"disallowOperatorBeforeLineBreak": ["."],
"disallowPaddingNewlinesBeforeKeywords": ["else", "case", "catch", "typeof"],
Expand All @@ -22,8 +24,10 @@
"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
"disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideParentheses": true,
"disallowTabs": true,
"disallowTrailingComma": true,
"disallowTrailingWhitespace": true,
"disallowUnusedParams": true,
"maximumLineLength": { "value": 85, "allowComments": true },
"requireBlocksOnNewline": 1,
"requireCamelCaseOrUpperCaseIdentifiers": true,
Expand All @@ -41,6 +45,7 @@
"requireParenthesesAroundIIFE": true,
"requireSemicolons": true,
"requireSpaceAfterBinaryOperators": true,
"requireSpaceAfterComma": true,
"requireSpaceAfterKeywords": true,
"requireSpaceAfterLineComment": true,
"requireSpaceBeforeBinaryOperators": true,
Expand Down
2 changes: 1 addition & 1 deletion chai-immutable.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
}

function chainCollectionInclude(_super) {
return function (val) {
return function () {
_super.apply(this, arguments);
};
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"coveralls": "^2.11.4",
"immutable": "^3.7.5",
"istanbul": "^0.4.0",
"jscs": "^2.1.1",
"jscs": "^2.5.0",
"mocha": "^2.3.3",
"mocha-phantomjs": "^4.0.1"
}
Expand Down

0 comments on commit 6c12491

Please sign in to comment.