jenkins-bot has submitted this change and it was merged.
Change subject: build: Update jscs and use new "wikimedia" preset
......................................................................
build: Update jscs and use new "wikimedia" preset
Our coding style has been upstreamed and first released
in node-jscs v1.5.0 (grunt-jscs-checker v0.6.0).
Change-Id: Iaa5e45d1b7c64f14aabcdf62b051aba9a3491494
---
M .jscsrc
M package.json
2 files changed, 2 insertions(+), 99 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index a26f6a7..9d22e3f 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,100 +1,3 @@
{
- "requireCurlyBraces": [
- "if",
- "else",
- "for",
- "while",
- "do",
- "try",
- "catch"
- ],
- "requireSpaceAfterKeywords": [
- "if",
- "else",
- "for",
- "while",
- "do",
- "switch",
- "return",
- "try",
- "catch",
- "function"
- ],
- "requireSpaceBeforeBlockStatements": true,
- "requireParenthesesAroundIIFE": true,
- "requireSpacesInConditionalExpression": true,
- "disallowSpacesInNamedFunctionExpression": {
- "beforeOpeningRoundBrace": true
- },
- "disallowSpacesInFunctionDeclaration": {
- "beforeOpeningRoundBrace": true
- },
- "requireMultipleVarDecl": "onevar",
- "requireBlocksOnNewline": 1,
- "disallowEmptyBlocks": true,
- "requireSpacesInsideObjectBrackets": "all",
- "requireSpacesInsideArrayBrackets": "all",
- "disallowQuotedKeysInObjects": true,
- "disallowDanglingUnderscores": true,
- "disallowSpaceAfterObjectKeys": true,
- "requireCommaBeforeLineBreak": true,
- "disallowSpaceAfterPrefixUnaryOperators": [
- "++",
- "--",
- "+",
- "-",
- "~",
- "!"
- ],
- "disallowSpaceBeforePostfixUnaryOperators": [
- "++",
- "--"
- ],
- "disallowSpaceBeforeBinaryOperators": [
- ","
- ],
- "requireSpaceBeforeBinaryOperators": [
- "=",
- "+",
- "-",
- "/",
- "*",
- "==",
- "===",
- "!=",
- "!==",
- ">",
- ">=",
- "<",
- "<="
- ],
- "requireSpaceAfterBinaryOperators": [
- "=",
- "+",
- "-",
- "/",
- "*",
- "==",
- "===",
- "!=",
- "!==",
- ">",
- ">=",
- "<",
- "<="
- ],
- "requireCamelCaseOrUpperCaseIdentifiers": true,
- "disallowKeywords": [ "with" ],
- "disallowMultipleLineBreaks": true,
- "validateLineBreaks": "LF",
- "validateQuoteMarks": "'",
- "validateIndentation": "\t",
- "disallowMixedSpacesAndTabs": true,
- "disallowTrailingWhitespace": true,
- "disallowTrailingComma": true,
- "disallowKeywordsOnNewLine": ["else"],
- "requireLineFeedAtFileEnd": true,
- "requireCapitalizedConstructors": true,
- "requireDotNotation": true,
- "disallowYodaConditions": true
+ "preset": "wikimedia"
}
diff --git a/package.json b/package.json
index 1afe9b4..ee09281 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,6 @@
"grunt-contrib-jshint": "0.10.0",
"grunt-contrib-qunit": "0.4.0",
"grunt-contrib-watch": "0.6.1",
- "grunt-jscs-checker": "0.4.4"
+ "grunt-jscs-checker": "0.6.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/141443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa5e45d1b7c64f14aabcdf62b051aba9a3491494
Gerrit-PatchSet: 3
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
