Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / .jshintrc

diff --git a/.jshintrc b/.jshintrc
index b84d276..441c4e3 100644 (file)
--- a/.jshintrc
+++ b/.jshintrc
@@ -2,14 +2,15 @@
        // Enforcing
        "bitwise": true,
        "eqeqeq": true,
-       "es3": true,
+       "esversion": 3,
        "freeze": true,
-       "latedef": true,
+       "futurehostile": true,
+       "latedef": "nofunc",
        "noarg": true,
        "nonew": true,
+       "strict": false,
        "undef": true,
        "unused": true,
-       "strict": false,
 
        // Relaxing
        "laxbreak": true,
@@ -19,10 +20,12 @@
        "browser": true,
 
        "globals": {
+               "require": false,
+               "module": false,
                "mediaWiki": true,
                "JSON": true,
                "OO": true,
-               "performance": true,
+               "mwPerformance": true,
                "jQuery": false,
                "QUnit": false,
                "sinon": false