From: James D. Forrester <jforrester@wikimedia.org>
Date: Fri, 1 May 2015 22:37:14 +0000 (-0700)
Subject: build: Bump various devDependencies
X-Git-Tag: 1.31.0-rc.0~11529
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=5f7c6c5805db9bdfcac40888dd2a3667d2a3f67c;p=lhc%2Fweb%2Fwiklou.git

build: Bump various devDependencies

	grunt-contrib-jshint:  0.11.0 -> 0.11.2
	grunt-jscs:            1.5.0  -> 1.8.0
	karma-chrome-launcher: 0.1.7  -> 0.1.8
	qunitjs:               1.17.1 -> 1.18.0

Some trivial indentation and line-spacing changes to make this pass jscs.

Change-Id: Ieeb6dbcd3e6d9f6f0fb9865d356da462b9b0499b
---

diff --git a/package.json b/package.json
index fc2bd3ad0a..42270f74b7 100644
--- a/package.json
+++ b/package.json
@@ -11,15 +11,15 @@
     "grunt-cli": "0.1.13",
     "grunt-banana-checker": "0.2.1",
     "grunt-contrib-copy": "0.8.0",
-    "grunt-contrib-jshint": "0.11.0",
+    "grunt-contrib-jshint": "0.11.2",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-jscs": "1.5.0",
+    "grunt-jscs": "1.8.0",
     "grunt-jsonlint": "1.0.4",
     "grunt-karma": "0.10.1",
     "karma": "0.12.31",
-    "karma-chrome-launcher": "0.1.7",
+    "karma-chrome-launcher": "0.1.8",
     "karma-firefox-launcher": "0.1.4",
     "karma-qunit": "0.1.4",
-    "qunitjs": "1.17.1"
+    "qunitjs": "1.18.0"
   }
 }
diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js
index ff5ff0a936..94fdca594f 100644
--- a/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@ -708,7 +708,6 @@
 	/* Public scope */
 
 	$.tablesorter = {
-
 			defaultOptions: {
 				cssHeader: 'headerSort',
 				cssAsc: 'headerSortUp',
diff --git a/resources/src/mediawiki.api/mediawiki.api.js b/resources/src/mediawiki.api/mediawiki.api.js
index 3a19e021b0..08996fe069 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -5,7 +5,6 @@
 	// wondering, would it be simpler to make it easy to clone the api object,
 	// change error handling, and use that instead?
 	var defaultOptions = {
-
 			// Query parameters for API requests
 			parameters: {
 				action: 'query',
@@ -21,6 +20,7 @@
 				dataType: 'json'
 			}
 		},
+
 		// Keyed by ajax url and symbolic name for the individual request
 		promises = {};
 
diff --git a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
index 56b0fa92c4..4bf44b079c 100644
--- a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
@@ -244,16 +244,15 @@
 
 	caretSample = 'Some big text that we like to work with. Nothing fancy... you know what I mean?';
 
-/*
-	// @broken: Disabled per bug 34820
+	/* @broken: Disabled per bug 34820
 	caretTest({
-	description: 'getCaretPosition with original/empty selection - bug 31847 with IE 6/7/8',
-	text: caretSample,
-	start: [0, caretSample.length], // Opera and Firefox (prior to FF 6.0) default caret to the end of the box (caretSample.length)
-	end: [0, caretSample.length], // Other browsers default it to the beginning (0), so check both.
-	mode: 'get'
+		description: 'getCaretPosition with original/empty selection - bug 31847 with IE 6/7/8',
+		text: caretSample,
+		start: [0, caretSample.length], // Opera and Firefox (prior to FF 6.0) default caret to the end of the box (caretSample.length)
+		end: [0, caretSample.length], // Other browsers default it to the beginning (0), so check both.
+		mode: 'get'
 	});
-*/
+	*/
 
 	caretTest( {
 		description: 'set/getCaretPosition with forced empty selection',
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index 5dcd941c5d..d9fd6a7d0a 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -397,7 +397,7 @@
 		);
 	} );
 
-// Tests that {{-transformation vs. general parsing are done as requested
+	// Tests that {{-transformation vs. general parsing are done as requested
 	QUnit.test( 'Curly brace transformation', 16, function ( assert ) {
 		var oldUserLang = mw.config.get( 'wgUserLanguage' );