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

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: Ieb8e4b02d3b8f8d8bf6f45face1f584ed4bb6204
---
M .jscsrc
M Gruntfile.js
2 files changed, 11 insertions(+), 21 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.jscsrc b/.jscsrc
index 49f6253..74c47b6 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/**" ]
+  "preset": "wikimedia"
 }
diff --git a/Gruntfile.js b/Gruntfile.js
index a8b36cb..b0b67b3 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: {
@@ -26,13 +30,15 @@
                        all: [
                                '**/*.json',
                                '.stylelintrc',
-                               '!node_modules/**'
+                               '!node_modules/**',
+                               '!vendor/**'
                        ]
                },
                stylelint: {
                        all: [
                                '**/*.css',
-                               '!node_modules/**'
+                               '!node_modules/**',
+                               '!vendor/**'
                        ]
                }
        } );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb8e4b02d3b8f8d8bf6f45face1f584ed4bb6204
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Jonas Kress (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