Merge remote-tracking branch 'upstream/pull/1961'

[rails.git] / config / jshint.yml

diff --git a/config/jshint.yml b/config/jshint.yml
index 40219023775455291440963408e9d406dae49c4b..a7e22486be30795e32fb5d795ebb5a063773e4f7 100644 (file)
--- a/config/jshint.yml
+++ b/config/jshint.yml
@@ -1,6 +1,7 @@
 files:
   - "**/*.js"
 exclude_paths:
+  - "app/assets/javascripts/i18n"
   - "vendor/assets/javascripts"
 options:
   eqeqeq: true
@@ -15,11 +16,15 @@ 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
+    bowser: false