diff --git a/.jshintrc b/.jshintrc index 604e4aac04c1fa97affb0778328c62f722d5feb2..ef71670d231fb7785aadb929c05be8ce97641a7f 100644 --- a/.jshintrc +++ b/.jshintrc @@ -17,5 +17,8 @@ "esnext": true, "eqnull": true, "browser": true, - "worker": true + "worker": true, + "globals": { + "JSON": false + } } diff --git a/package.json b/package.json index fa8d38bc80a01fdeb5f813d44d8373011d9af688..d3dd61ae59f95fd2280500391ec3b29c1922454f 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "devDependencies": { "bower": "1.3.8", "chai": "1.10.0", - "jshint": "2.5.2", + "jshint": "2.8.0", "mocha-phantomjs": "3.5.2", "mocha": "2.1.0", "phantomjs": "1.9.19" diff --git a/test/.jshintrc b/test/.jshintrc index 2fa08ad76783c5349f3c19bcf1c115ea29ec2adb..042bc744ab8e10e5540a1e1c75547641f7a16043 100644 --- a/test/.jshintrc +++ b/test/.jshintrc @@ -1,22 +1,8 @@ { - "curly": true, - "eqeqeq": true, - "immed": true, - "indent": 2, - "latedef": true, - "newcap": true, - "noarg": true, - "quotmark": true, - "undef": true, - "unused": true, - "trailing": true, - "asi": true, - "boss": true, - "esnext": true, + "extends": "../.jshintrc", + "es3": false, + "strict": false, "sub": true, - "eqnull": true, - "browser": true, - "worker": true, "globals": { "fetch": false, "Headers": false,