diff options
author | Chris Rebert <github@rebertia.com> | 2015-02-07 00:46:26 +0300 |
---|---|---|
committer | Chris Rebert <github@rebertia.com> | 2015-02-07 00:46:26 +0300 |
commit | 3b2934b9d55949c63e37dd867285bf7701535424 (patch) | |
tree | 8d79f8797bac92f6d02fd5ae829e1fb09bc69730 | |
parent | 9cceebc981f7aaae96ad0a1033e948c0dc9b27ab (diff) | |
parent | e3de6ca257a44f0775f9ebf586376e65c1f9f1fc (diff) |
Merge pull request #11 from twbs/bump-jscs
Bump JSCS
-rw-r--r-- | .jscsrc | 3 | ||||
-rw-r--r-- | Gruntfile.js | 2 | ||||
-rw-r--r-- | package.json | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,3 @@ - { "disallowEmptyBlocks": true, "disallowKeywords": ["with"], @@ -8,6 +7,7 @@ "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], "disallowSpacesInCallExpression": true, + "disallowSpacesInsideBrackets": true, "disallowTrailingWhitespace": true, "esnext": true, "requireCapitalizedConstructors": true, @@ -21,6 +21,7 @@ "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], "requireSpacesInConditionalExpression": true, "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "requireSpacesInForStatement": true, "validateIndentation": 4, "validateLineBreaks": "LF", "validateParameterSeparator": ", ", diff --git a/Gruntfile.js b/Gruntfile.js index 95f4c88..66f3030 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,7 +61,7 @@ module.exports = function (grunt) { src: '<%= jshint.gruntfile.src %>' }, lib: { - src: ['src/**/*.js', '!src/browser/mq4-hover-shim.js'] + src: ['src/**/*.js'] }, test: { src: '<%= jshint.test.src %>' diff --git a/package.json b/package.json index dfd91d6..774c0a3 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "grunt-contrib-jshint": "^0.11.0", "grunt-contrib-nodeunit": "^0.4.1", "grunt-eslint": "^5.0.0", - "grunt-jscs": "^1.0.0", + "grunt-jscs": "^1.5.0", "jscs-jsdoc": "^0.4.0", "load-grunt-tasks": "^3.0.0", "time-grunt": "^1.0.0" |