Build: Update grunt-contrib-jshint

JSON needed to be added to JSHint globals as it's not implied by the es3
setting and yet all our supported browsers have it implemented.

(cherry-picked from 1556c4661af647e355a9a5c0a814012955e231bc)

diff --git a/package.json b/package.json
index 6b90dc4c8e41e9e0c18869acd6214202e05fdb1c..521cbe1ec7396f9414b4e36e1eeeedde6cf7ff6f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "grunt": "0.4.5",
     "grunt-cli": "0.1.13",
     "grunt-compare-size": "0.4.0",
-    "grunt-contrib-jshint": "0.10.0",
+    "grunt-contrib-jshint": "0.11.2",
     "grunt-contrib-uglify": "0.7.0",
     "grunt-contrib-watch": "0.6.1",
     "grunt-git-authors": "2.0.1",

diff --git a/src/.jshintrc b/src/.jshintrc
index 2de9e9c8da7305b4d606c5fb0781f4ca7ab081dc..d0445ba77c0ad26d21fbe6d0da35eff600ef8be1 100644 (file)
--- a/src/.jshintrc
+++ b/src/.jshintrc
@@ -17,6 +17,7 @@
        "wsh": true,
 
        "globals": {
+               "JSON": false,
                "jQuery": true,
                "define": false,
                "module": false,

diff --git a/test/.jshintrc b/test/.jshintrc
index c25fe832ec59ccdfb461555e3b971f1631020897..f345337a199c16a1751c1a32e93cfdb94e3cf501 100644 (file)
--- a/test/.jshintrc
+++ b/test/.jshintrc
@@ -22,6 +22,8 @@
                "require": false,
                "define": false,
                "DOMParser": false,
+               "JSON": false,
+               "Promise": false,
                "QUnit": false,
                "ok": false,
                "equal": false,