diff --git a/.hound.yml b/.hound.yml index ef1551ba..8355a088 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,6 +1,3 @@ -jshint: - config_file: .jshintrc - eslint: enabled: true config_file: .eslintrc.hound.json diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 013e31e8..00000000 --- a/.jshintrc +++ /dev/null @@ -1,16 +0,0 @@ -{ - "browser": true, - "curly": true, - "eqeqeq": false, - "loopfunc": false, - "noarg": true, - "trailing": true, - "undef": true, - "unused": false, - - "globals": { - "OpenSeadragon": true, - "define": false, - "module": false - } -} diff --git a/Gruntfile.js b/Gruntfile.js index c339e8ae..c2e821ad 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -5,7 +5,6 @@ module.exports = function(grunt) { // ---------- grunt.loadNpmTasks("grunt-contrib-compress"); grunt.loadNpmTasks("grunt-contrib-concat"); - grunt.loadNpmTasks("grunt-contrib-jshint"); grunt.loadNpmTasks("grunt-contrib-uglify"); grunt.loadNpmTasks("grunt-qunit-istanbul"); grunt.loadNpmTasks("grunt-contrib-connect"); @@ -188,13 +187,6 @@ module.exports = function(grunt) { files: [ "Gruntfile.js", "src/*.js", "images/*" ], tasks: "watchTask" }, - jshint: { - options: { - jshintrc: '.jshintrc' - }, - beforeconcat: sources, - afterconcat: [ distribution ] - }, eslint: { options: { configFile: '.eslintrc.json' @@ -272,8 +264,8 @@ module.exports = function(grunt) { // Build task. // Cleans out the build folder and builds the code and images into it, checking lint. grunt.registerTask("build", [ - "clean:build", "jshint:beforeconcat", "git-describe", "concat", "jshint:afterconcat", - "eslint", "uglify", "replace:cleanPaths", "copy:build" + "clean:build", "git-describe", "eslint", "concat", "uglify", + "replace:cleanPaths", "copy:build" ]); // ---------- diff --git a/package.json b/package.json index 2ef3b31c..2fd0cad7 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "grunt-contrib-compress": "^0.13.0", "grunt-contrib-concat": "^1.0.1", "grunt-contrib-connect": "^0.11.2", - "grunt-contrib-jshint": "^0.11.0", "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "^0.6.1", "grunt-git-describe": "^2.3.2",