From 459432f2a7f79a0512e898652a266bd62d714adf Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 18 Nov 2014 20:44:44 +0000
Subject: [PATCH] build: Upgrade grunt-jscs and remove legacy jshint
 camelcase/nomen

Follows-up 4ec6b0cce.

grunt-jscs v0.7.0 upgraded node-jscs to v0.6.0 which introduced
the ability to disable rules via inline comments.

This means we can finally remove the deprecated jshint rules for
coding style rules and restrict jshint to code quality only.

Unsuppress the equivalent rules from jscs.

Change-Id: Idacf7e552d656ee139863d927e5bfc1f86af8283
---
 .jscsrc                                                     | 2 --
 .jshintrc                                                   | 6 +-----
 resources/src/mediawiki.legacy/ajax.js                      | 2 +-
 resources/src/mediawiki.special/mediawiki.special.upload.js | 3 ++-
 tests/frontend/package.json                                 | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.jscsrc b/.jscsrc
index b9139b2fad..2ebd40eeb8 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,10 +1,8 @@
 {
 	"preset": "wikimedia",
 
-	"disallowDanglingUnderscores": null,
 	"disallowKeywordsOnNewLine": null,
 	"disallowQuotedKeysInObjects": null,
-	"requireCamelCaseOrUpperCaseIdentifiers": null,
 	"requireSpacesInsideArrayBrackets": null,
 	"validateIndentation": null
 }
diff --git a/.jshintrc b/.jshintrc
index c136dfc6c8..92c8c4320c 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -22,9 +22,5 @@
 		"mediaWiki": true,
 		"jQuery": false,
 		"QUnit": false
-	},
-
-	// Legacy (to be handled by jscs once supported)
-	"camelcase": true,
-	"nomen": true
+	}
 }
diff --git a/resources/src/mediawiki.legacy/ajax.js b/resources/src/mediawiki.legacy/ajax.js
index 6b9464a914..cf9e27f117 100644
--- a/resources/src/mediawiki.legacy/ajax.js
+++ b/resources/src/mediawiki.legacy/ajax.js
@@ -5,7 +5,7 @@
  * http://www.modernmethod.com/sajax/
  */
 
-/*jshint camelcase:false */
+/*jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 /*global alert */
 ( function ( mw ) {
 
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js
index 87de6464b8..c6ee1a7793 100644
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@ -382,10 +382,11 @@
 				};
 				img.src = dataURL;
 			}, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
-				/*jshint camelcase:false, nomen:false */
 				try {
 					meta = mw.libs.jpegmeta( data, file.fileName );
+					// jscs:disable requireCamelCaseOrUpperCaseIdentifiers, disallowDanglingUnderscores
 					meta._binary_data = null;
+					// jscs:enable
 				} catch ( e ) {
 					meta = null;
 				}
diff --git a/tests/frontend/package.json b/tests/frontend/package.json
index 791336322a..9b15379a13 100644
--- a/tests/frontend/package.json
+++ b/tests/frontend/package.json
@@ -9,7 +9,7 @@
     "grunt-contrib-jshint": "0.10.0",
     "grunt-contrib-watch": "0.6.1",
     "grunt-banana-checker": "0.2.0",
-    "grunt-jscs": "0.6.1",
+    "grunt-jscs": "0.8.1",
     "grunt-jsonlint": "1.0.4"
   }
 }
-- 
2.20.1