aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Gaidarenko <markelog@gmail.com>2014-04-15 18:08:18 +0400
committerOleg Gaidarenko <markelog@gmail.com>2014-04-15 18:10:51 +0400
commit5ac2186903acd9858e1f0e4891e47a244b2303af (patch)
tree9d3e930d62e2cb93df3fa52fdafdc1e35bcb41cf
parent3dc5504237a0fec0d6dcc6d994a9b3950739d579 (diff)
downloadjquery-5ac2186903acd9858e1f0e4891e47a244b2303af.tar.gz
jquery-5ac2186903acd9858e1f0e4891e47a244b2303af.zip
Build: Update jscsrc
* Update "grunt-jscs-checker" package * Use ".jscsrc" file instead of old ".jscs.json" * Use jquery preset instead of explicitly defining all the jscs rules (Cherry-picked from b7283d738ec4c2d9d87cb16c32a3209cab567ed1 commit)
-rw-r--r--.jscs.json23
-rw-r--r--.jscsrc5
-rw-r--r--package.json2
3 files changed, 6 insertions, 24 deletions
diff --git a/.jscs.json b/.jscs.json
deleted file mode 100644
index f2d8a1fb7..000000000
--- a/.jscs.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "requireCurlyBraces": [ "if", "else", "for", "while", "do" ],
- "requireSpaceAfterKeywords": [ "if", "else", "for", "while", "do", "switch", "return" ],
- "requireSpacesInFunctionExpression": {
- "beforeOpeningCurlyBrace": true
- },
- "disallowSpacesInFunctionExpression": {
- "beforeOpeningRoundBrace": true
- },
- "requireMultipleVarDecl": true,
- "requireSpacesInsideObjectBrackets": "all",
- "requireSpacesInsideArrayBrackets": "all",
- "disallowLeftStickedOperators": [ "?", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=" ],
- "disallowRightStickedOperators": [ "?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
- "requireRightStickedOperators": [ "!" ],
- "requireLeftStickedOperators": [ "," ],
- "disallowKeywords": [ "with" ],
- "disallowMultipleLineBreaks": true,
- "disallowKeywordsOnNewLine": [ "else" ],
- "requireLineFeedAtFileEnd": true,
-
- "excludeFiles": [ "src/intro.js", "src/outro.js", "src/sizzle/**/*" ]
-}
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000000000..219398928
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,5 @@
+{
+ "preset": "jquery",
+
+ "excludeFiles": [ "src/intro.js", "src/outro.js", "src/sizzle/**/*" ]
+}
diff --git a/package.json b/package.json
index e4970fa78..39c5b22a2 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"grunt-contrib-uglify": "0.3.2",
"grunt-contrib-watch": "0.5.3",
"grunt-git-authors": "1.2.0",
- "grunt-jscs-checker": "0.3.2",
+ "grunt-jscs-checker": "0.4.1",
"grunt-jsonlint": "1.0.4",
"gzip-js": "0.3.2",
"load-grunt-tasks": "0.3.0",