aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gruntfile.js31
-rw-r--r--package.json2
2 files changed, 9 insertions, 24 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index bf09ef6e1..482eb45d6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -176,30 +176,15 @@ grunt.initConfig({
})
},
jshint: {
- ui: {
- options: {
- jshintrc: "ui/.jshintrc"
- },
- files: {
- src: "ui/*.js"
- }
- },
- grunt: {
- options: {
- jshintrc: ".jshintrc"
- },
- files: {
- src: [ "Gruntfile.js", "build/**/*.js" ]
- }
+ options: {
+ jshintrc: true
},
- tests: {
- options: {
- jshintrc: "tests/.jshintrc"
- },
- files: {
- src: "tests/unit/**/*.js"
- }
- }
+ src: [
+ "ui/*.js",
+ "Gruntfile.js",
+ "build/**/*.js",
+ "tests/unit/**/*.js"
+ ]
},
csslint: {
base_theme: {
diff --git a/package.json b/package.json
index 1495a16c2..02fbf7c5a 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"dependencies": {},
"devDependencies": {
"grunt": "0.4.1",
- "grunt-contrib-jshint": "0.6.3",
+ "grunt-contrib-jshint": "0.7.1",
"grunt-contrib-uglify": "0.1.1",
"grunt-contrib-concat": "0.1.3",
"grunt-contrib-qunit": "0.2.0",