From 8bdd289576e2606f53b72498e3fc7581a6c437bb Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 7 Nov 2013 21:14:49 +0000
Subject: [PATCH] Update jshint grunt task to exclude eqeqeq and curly for now,
 until we've resolved other code smells.

props kadamwhite.
see #25187.


git-svn-id: https://develop.svn.wordpress.org/trunk@26041 602fd350-edb4-49c9-b593-d223f7449a82
---
 .jshintrc    |  6 ++--
 Gruntfile.js | 81 ++++++++++++++++++++++++----------------------------
 2 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 390d8a3083..5cdce23064 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -3,20 +3,22 @@
 	"curly": true,
 	"eqeqeq": true,
 	"eqnull": true,
+	"es3": true,
 	"expr": true,
 	"immed": true,
 	"noarg": true,
+	"onevar": true,
 	"quotmark": "single",
 	"smarttabs": true,
 	"trailing": true,
 	"undef": true,
 	"unused": true,
-	"es3": true,
-	"onevar": true,
 
 	"browser": true,
 
 	"globals": {
+		"_": false,
+		"Backbone": false,
 		"jQuery": false,
 		"wp": false
 	}
diff --git a/Gruntfile.js b/Gruntfile.js
index 8d4955f5ee..c570eb7e63 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -83,54 +83,47 @@ module.exports = function(grunt) {
 		jshint: {
 			options: grunt.file.readJSON('.jshintrc'),
 			grunt: {
-				files: {
-					src: ['Gruntfile.js']
-				},
-				options: {
-					onevar: true
-				}
+				src: ['Gruntfile.js']
 			},
 			tests: {
-				files: {
-					src: [
-						'tests/qunit/**/*.js',
-						'!tests/qunit/vendor/qunit.js'
-					]
-				},
+				src: [
+					'tests/qunit/**/*.js',
+					'!tests/qunit/vendor/qunit.js'
+				],
 				options: grunt.file.readJSON('tests/qunit/.jshintrc')
 			},
-			'wp-admin': {
-				files: {
-					src: [
-						'src/wp-admin/js/**/*.js',
-						'!src/wp-admin/js/farbtastic.js',
-						'!src/wp-admin/js/iris.min.js'
-					]
-				}
-			},
-			'wp-includes': {
-				files: {
-					src: [
-						'src/wp-includes/js/**/*.js',
-						// 3rd-Party Scripts
-						'!src/wp-includes/js/backbone.min.js',
-						'!src/wp-includes/js/colorpicker.js',
-						'!src/wp-includes/js/crop/**/*.js',
-						'!src/wp-includes/js/hoverIntent.js',
-						'!src/wp-includes/js/imgareaselect/**/*.js',
-						'!src/wp-includes/js/jcrop/**/*.js',
-						'!src/wp-includes/js/jquery/**/*.js',
-						'!src/wp-includes/js/json2.js',
-						'!src/wp-includes/js/mediaelement/**/*.js',
-						'!src/wp-includes/js/plupload/**/*.js',
-						'!src/wp-includes/js/swfobject.js',
-						'!src/wp-includes/js/swfupload/**/*.js',
-						'!src/wp-includes/js/thickbox/**/*.js',
-						'!src/wp-includes/js/tinymce/**/*.js',
-						'!src/wp-includes/js/tw-sack.js',
-						'!src/wp-includes/js/underscore.min.js',
-						'!src/wp-includes/js/zxcvbn.min.js'
-					]
+			core: {
+				expand: true,
+				cwd: SOURCE_DIR,
+				src: [
+					'wp-admin/js/*.js',
+					'wp-includes/js/*.js',
+					// WordPress scripts inside directories
+					'wp-includes/js/jquery/jquery.table-hotkeys.js',
+					'wp-includes/js/mediaelement/wp-mediaelement.js',
+					'wp-includes/js/plupload/handlers.js',
+					'wp-includes/js/plupload/wp-plupload.js',
+					'wp-includes/js/tinymce/langs/wp-langs-en.js',
+					'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js',
+					'wp-includes/js/tinymce/plugins/wp*/editor_plugin_src.js',
+					'wp-includes/js/tinymce/mark_loaded_src.js',
+					'wp-includes/js/tinymce/wp-tinymce-schema.js',
+					// Third party scripts
+					'!wp-admin/js/farbtastic.js',
+					'!wp-admin/js/iris.min.js',
+					'!wp-includes/js/backbone.min.js',
+					'!wp-includes/js/swfobject.js',
+					'!wp-includes/js/underscore.min.js',
+					'!wp-includes/js/zxcvbn.min.js',
+					'!wp-includes/js/colorpicker.js',
+					'!wp-includes/js/hoverIntent.js',
+					'!wp-includes/js/json2.js',
+					'!wp-includes/js/tw-sack.js'
+				],
+				// Remove once other JSHint errors are resolved
+				options: {
+					curly: false,
+					eqeqeq: false
 				}
 			}
 		},