Merge branch 'master' into moderation

[rails.git] / config / jshint.yml

diff --git a/config/jshint.yml b/config/jshint.yml
index 40219023775455291440963408e9d406dae49c4b..14cd45d1dbe074b68667f9284db9f273c0b88dd6 100644 (file)
--- a/config/jshint.yml
+++ b/config/jshint.yml
@@ -15,11 +15,14 @@ options:
   unused: true
   trailing: true
   globals:
-    I18n: true
+    I18n: false
     L: true
     OSM: true
-    Piwik: true
+    Piwik: false
+    alert: false
+    escape: false
     maximiseMap: false
     minimiseMap: false
-    querystring: false
+    querystring: true
+    require: false
     updateLinks: false