Merge pull request #15462 from twbs/bump-jscs

bump grunt-jscs to ~1.1.0
twbs · Dec 29, 2014 · e4c7a92 · e4c7a92
2 parents f149e43 + 2ae4c0b
commit e4c7a92
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/js/.jscsrc b/js/.jscsrc
@@ -22,6 +22,7 @@
   "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
   "requireSpaceAfterLineComment": true,
   "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
+  "requireSpaceBetweenArguments": true,
   "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
   "requireSpacesInConditionalExpression": true,
   "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },

diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "grunt-exec": "~0.4.6",
     "grunt-html-validation": "~0.1.18",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~1.0.0",
+    "grunt-jscs": "~1.1.0",
     "grunt-saucelabs": "~8.4.0",
     "grunt-sed": "~0.1.1",
     "load-grunt-tasks": "~2.0.0",

diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json