From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 4 Sep 2015 22:58:22 +0000 (+0000)
Subject: Merge "build: Bump grunt-jscs to 2.1.0 and make pass"
X-Git-Tag: 1.31.0-rc.0~10136
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=1fc4bf9d258bb95d5fe464f204c7b636c0ebf5cb;hp=d2ead083a1ea91e2a113da4eeca68a7979e1d839;p=lhc%2Fweb%2Fwiklou.git

Merge "build: Bump grunt-jscs to 2.1.0 and make pass"
---

diff --git a/.jscsrc b/.jscsrc
index 6a3c56408b..c9f9a4608a 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -4,6 +4,9 @@
 	"disallowQuotedKeysInObjects": null,
 	"requireSpacesInsideParentheses": null,
 	"requireSpacesInsideArrayBrackets": null,
+	"requireVarDeclFirst": null,
+	"requireSpacesInsideBrackets": null,
+	"jsDoc": null,
 
 	"excludeFiles": [
 		"docs/**",
diff --git a/package.json b/package.json
index 19584613f0..7b7004843c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "grunt-contrib-copy": "0.8.0",
     "grunt-contrib-jshint": "0.11.3",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-jscs": "1.8.0",
+    "grunt-jscs": "2.1.0",
     "grunt-jsonlint": "1.0.4",
     "grunt-karma": "0.11.0",
     "karma": "0.12.36",
diff --git a/resources/src/mediawiki/mediawiki.debug.js b/resources/src/mediawiki/mediawiki.debug.js
index bdff99f7a1..3153fd4782 100644
--- a/resources/src/mediawiki/mediawiki.debug.js
+++ b/resources/src/mediawiki/mediawiki.debug.js
@@ -291,12 +291,14 @@
 			for ( i = 0, length = this.data.queries.length; i < length; i += 1 ) {
 				query = this.data.queries[i];
 
+				// jscs: disable requireDotNotation
 				$( '<tr>' )
 					.append( $( '<td>' ).text( i + 1 ) )
 					.append( $( '<td>' ).text( query.sql ) )
 					.append( $( '<td class="stats">' ).text( ( query.time * 1000 ).toFixed( 4 ) + 'ms' ) )
 					.append( $( '<td>' ).text( query['function'] ) )
 				.appendTo( $table );
+				// jscs: enable requireDotNotation
 			}
 
 			return $table;