Merge "Make phpunit.php less hackish, and install the listener unconditionally"

[lhc/web/wiklou.git] / .eslintrc.json

diff --git a/.eslintrc.json b/.eslintrc.json
index da5d409..f7a79ac 100644 (file)
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,13 +1,15 @@
 {
        "extends": "wikimedia",
        "env": {
-               "browser": true,
-               "jquery": true
+               "browser": true
        },
        "globals": {
                "require": false,
                "module": false,
+               "mw": false,
+               "$": false,
                "mediaWiki": false,
+               "jQuery": false,
                "OO": false
        },
        "rules": {
@@ -18,6 +20,11 @@
                                "property": "map",
                                "message": "Please use Array.prototype.map instead"
                        },
+                       {
+                               "object": "$",
+                               "property": "inArray",
+                               "message": "Please use Array.prototype.indexOf instead"
+                       },
                        {
                                "object": "$",
                                "property": "isArray",