From: James D. Forrester Date: Tue, 4 Aug 2015 02:13:14 +0000 (-0700) Subject: build: Bump grunt-jscs to 2.1.0 and make pass X-Git-Tag: 1.31.0-rc.0~10134^2~1 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=5ac63862df022e648750c8694162520a3d4e4c2b;p=lhc%2Fweb%2Fwiklou.git build: Bump grunt-jscs to 2.1.0 and make pass Change-Id: I7c5a38ad16c471bb1443a5bde56dda4203fcfad5 --- 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 $( '' ) .append( $( '' ).text( i + 1 ) ) .append( $( '' ).text( query.sql ) ) .append( $( '' ).text( ( query.time * 1000 ).toFixed( 4 ) + 'ms' ) ) .append( $( '' ).text( query['function'] ) ) .appendTo( $table ); + // jscs: enable requireDotNotation } return $table;