Manually merged the two jshintrc files until issue 1314 in jshint is merged.

2013-10-23 09:01:47 -07:00
parent c1c88225eb
commit 35209ea61a
1 changed files with 26 additions and 1 deletions
--- a/test/.jshintrc
+++ b/test/.jshintrc
@ -1,5 +1,30 @@
 {
-  "extends": "../.jshintrc",
+  "node": true,
+  "white": true,
+  "bitwise": false,
+  "curly": true,
+  "eqnull": true,
+  "eqeqeq": true,
+  "forin": true,
+  "immed": true,
+  "expr": true,
+  "indent": 2,
+  "latedef": "nofunc",
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "undef": true,
+  "quotmark": "single",
+  "plusplus": false,
+  "boss": true,
+  "trailing": true,
+  "laxbreak": true,
+  "laxcomma": true,
+  "validthis": true,
+  "sub": true,
+  "maxlen": 140,
+  "-W084": true,
+  "maxerr": 10,

  "-W030": true,
  "-W068": true,