From a022da70568119688445708970bec1346c9d4217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski?= Date: Mon, 1 Jun 2015 23:25:38 +0200 Subject: [PATCH] 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) --- package.json | 2 +- src/.jshintrc | 1 + test/.jshintrc | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b90dc4c8..521cbe1ec 100644 --- 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 2de9e9c8d..d0445ba77 100644 --- 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 c25fe832e..f345337a1 100644 --- 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,