jenkins-bot has submitted this change and it was merged.

Change subject: JSHint: Re-order jshintrc options to split common from project 
settings
......................................................................


JSHint: Re-order jshintrc options to split common from project settings

There are certain options required by our coding conventions.
The others are specifically overriding it for core. Either
because we have certain code that needs laxing or because we
can be stricter.

Comments can be used in jshintrc since a while now. Though
they are invalid JSON, many parsers (including JSHint) allow
them for documentation purposes.

Change-Id: I43ace21208121e866900b2cbe1efbcebadd2946a
---
M .jshintrc
1 file changed, 21 insertions(+), 13 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.jshintrc b/.jshintrc
index 7fa138d..c4e265a 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,15 +1,10 @@
 {
-       "predef": [
-               "mediaWiki",
-               "jQuery",
-               "QUnit"
-       ],
+       /* Common */
 
-       "bitwise": true,
+       // Enforcing
        "camelcase": true,
        "curly": true,
        "eqeqeq": true,
-       "forin": false,
        "immed": true,
        "latedef": true,
        "newcap": true,
@@ -17,18 +12,31 @@
        "noempty": true,
        "nonew": true,
        "quotmark": "single",
-       "regexp": false,
+       "trailing": true,
        "undef": true,
        "unused": true,
-       "strict": false,
-       "trailing": true,
+       // Legacy
+       "onevar": true,
 
+       /* Local */
+
+       // Enforcing
+       "bitwise": true,
+       "forin": false,
+       "regexp": false,
+       "strict": false,
+       // Relaxing
        "laxbreak": true,
        "smarttabs": true,
        "multistr": true,
-
+       // Environment
        "browser": true,
-
+       // Legacy
        "nomen": true,
-       "onevar": true
+
+       "predef": [
+               "mediaWiki",
+               "jQuery",
+               "QUnit"
+       ]
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ace21208121e866900b2cbe1efbcebadd2946a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to