From a722ffc9ca3252b51b90425f8543c5f3414b39c6 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 30 Apr 2015 09:30:48 +0300 Subject: Update grunt-jscs. Add a few more rules. The commented out ones should be enabled eventually. --- js/.jscsrc | 19 +++++++++++++++---- package.json | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/js/.jscsrc b/js/.jscsrc index 657ed65..0c1ff89 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -5,9 +5,10 @@ "disallowMultipleLineStrings": true, "disallowMultipleVarDecl": true, "disallowQuotedKeysInObjects": "allButReserved", - "disallowSpaceAfterPrefixUnaryOperators": ["!", "-", "--", "~", "+", "++"], + "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], "disallowSpaceBeforeBinaryOperators": [","], - "disallowSpaceBeforePostfixUnaryOperators": true, + "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + //"disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true }, "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true }, "disallowSpacesInsideArrayBrackets": true, "disallowSpacesInsideParentheses": true, @@ -18,21 +19,31 @@ "requireCapitalizedConstructors": true, "requireCommaBeforeLineBreak": true, "requireCurlyBraces": true, + //"requireDollarBeforejQueryAssignment": true, "requireDotNotation": true, "requireLineFeedAtFileEnd": true, + "requirePaddingNewLinesAfterUseStrict": true, + "requirePaddingNewLinesBeforeExport": true, "requireParenthesesAroundIIFE": true, - "requireSpaceAfterBinaryOperators": true, + "requireSemicolons": true, + "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], "requireSpaceAfterLineComment": true, - "requireSpaceBeforeBinaryOperators": true, + "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], "requireSpaceBeforeBlockStatements": true, + "requireSpaceBetweenArguments": true, "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true }, "requireSpacesInConditionalExpression": true, + //"requireSpacesInForStatement": true, "requireSpacesInFunction": { "beforeOpeningCurlyBrace": true }, + "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true }, + "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true }, "requireSpacesInsideObjectBrackets": "allButNested", + "validateAlignedFunctionParameters": true, "validateIndentation": 2, "validateLineBreaks": "LF", + "validateNewlineAfterArrayElements": true, "validateParameterSeparator": ", ", "validateQuoteMarks": "'" } diff --git a/package.json b/package.json index 607bcf4..2068431 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "grunt-csscomb": "~3.0.0", "grunt-html": "~4.0.3", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~1.6.0", + "grunt-jscs": "~1.8.0", "grunt-sed": "twbs/grunt-sed#v0.2.0", "load-grunt-tasks": "~3.1.0", "time-grunt": "~1.1.1" -- cgit v1.2.3