jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/353033 )

Change subject: Disable JSCS rule to disallow space after "function ()" keyword
......................................................................


Disable JSCS rule to disallow space after "function ()" keyword

All other code repositories we have either enforce the space in
"function ()", or make it optional. It does not make sense to have
some code repositories *disallow" this space. This is confusing.

Change-Id: Iddd991016f7bcb03382caa5932c53f15a4d8cdcd
---
M .jscsrc
M Gruntfile.js
2 files changed, 8 insertions(+), 20 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/.jscsrc b/.jscsrc
index 99b0b66..dc3da02 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,20 +1,4 @@
 {
        // 
https://github.com/wikimedia/jscs-preset-wikimedia/blob/master/presets/wikimedia.json
-       "preset": "wikimedia",
-
-       // ----
-       // Own rules
-
-       "disallowSpaceAfterKeywords": [
-               "catch",
-               "for",
-//             "if",
-               "switch",
-               "while"
-       ],
-       "requireSpaceAfterKeywords": [
-               "else"
-       ],
-
-       "excludeFiles": [ "node_modules/**", "vendor/**" ]
-}
\ No newline at end of file
+       "preset": "wikimedia"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 18752e1..d20944f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,10 +11,14 @@
                        options: {
                                jshintrc: true
                        },
-                       all: '.'
+                       all: [
+                               '**/*.js',
+                               '!node_modules/**',
+                               '!vendor/**'
+                       ]
                },
                jscs: {
-                       all: '.'
+                       src: '<%= jshint.all %>'
                },
                banana: {
                        options: {

-- 
To view, visit https://gerrit.wikimedia.org/r/353033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddd991016f7bcb03382caa5932c53f15a4d8cdcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to