From ee3d5a014fc61a4a9edea4bb4e536e444afb9415 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Thu, 4 May 2017 16:59:40 +0100 Subject: [PATCH] build: Update eslint to 0.4.0 and make pass Change-Id: Ib230392f332268ac801cf668f399fcefb1cb1cc5 --- package.json | 2 +- .../mediawiki.action/mediawiki.action.edit.preview.js | 4 ++-- .../dm/mw.rcfilters.dm.FiltersViewModel.js | 2 +- .../mediawiki.special.search.commonsInterwikiWidget.js | 2 +- .../mw.widgets.UsersMultiselectWidget.js | 10 +++++----- .../src/mediawiki/mediawiki.confirmCloseWindow.js | 1 + resources/src/mediawiki/mediawiki.inspect.js | 1 + .../resources/mediawiki/mediawiki.loader.test.js | 2 ++ tests/selenium/.eslintrc.json | 3 +++ 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 55f36a357a..ee42b072d0 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "devDependencies": { "deepmerge": "1.3.2", "eslint": "3.12.2", - "eslint-config-wikimedia": "0.3.0", + "eslint-config-wikimedia": "0.4.0", "grunt": "1.0.1", "grunt-banana-checker": "0.6.0", "grunt-contrib-copy": "1.0.0", diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js index 15d0a39584..143e46c0fb 100644 --- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js +++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js @@ -108,9 +108,9 @@ .revisions[ 0 ].diff.body; $wikiDiff.find( 'table.diff tbody' ).html( diffHtml ); mw.hook( 'wikipage.diff' ).fire( $wikiDiff.find( 'table.diff' ) ); - } catch ( e ) { + } catch ( err ) { // "result.blah is undefined" error, ignore - mw.log.warn( e ); + mw.log.warn( err ); } $wikiDiff.show(); } ); diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js index 69210be19f..849ea47bd5 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -513,7 +513,7 @@ * @param {string[]} valueArray Array of values * @return {string[]} Array of valid values */ - mw.rcfilters.dm.FiltersViewModel.prototype.sanitizeStringOptionGroup = function( groupName, valueArray ) { + mw.rcfilters.dm.FiltersViewModel.prototype.sanitizeStringOptionGroup = function ( groupName, valueArray ) { var result = [], validNames = this.getGroupFilters( groupName ).map( function ( filterItem ) { return filterItem.getParamName(); diff --git a/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js b/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js index 7e42886c5c..f3d1fea6df 100644 --- a/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js +++ b/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js @@ -66,7 +66,7 @@ return; } - results.sort( function( a, b ) { + results.sort( function ( a, b ) { return a.index - b.index; } ); diff --git a/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js b/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js index 70d7cb50f2..d7464b9a86 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js @@ -85,7 +85,7 @@ * * @return {Array} usernames */ - mw.widgets.UsersMultiselectWidget.prototype.getSelectedUsernames = function() { + mw.widgets.UsersMultiselectWidget.prototype.getSelectedUsernames = function () { return this.getItemsData(); }; @@ -94,7 +94,7 @@ * * @private */ - mw.widgets.UsersMultiselectWidget.prototype.updateMenuItems = function() { + mw.widgets.UsersMultiselectWidget.prototype.updateMenuItems = function () { var inputValue = this.$input.val(); if ( inputValue === this.inputValue ) { @@ -116,7 +116,7 @@ // character to uppercase so that "fo" may yield "Foo". auprefix: inputValue[ 0 ].toUpperCase() + inputValue.slice( 1 ), aulimit: this.limit - } ).done( function( response ) { + } ).done( function ( response ) { var suggestions = response.query.allusers, selected = this.getSelectedUsernames(); @@ -128,7 +128,7 @@ label: user.name } ); } - } ).filter( function( item ) { + } ).filter( function ( item ) { return item !== undefined; } ); @@ -154,7 +154,7 @@ * * @private */ - mw.widgets.UsersMultiselectWidget.prototype.updateHiddenInput = function() { + mw.widgets.UsersMultiselectWidget.prototype.updateHiddenInput = function () { if ( 'hiddenInput' in this ) { this.hiddenInput.val( this.getSelectedUsernames().join( '\n' ) ); } diff --git a/resources/src/mediawiki/mediawiki.confirmCloseWindow.js b/resources/src/mediawiki/mediawiki.confirmCloseWindow.js index e3a8f7b20c..ee3bac246c 100644 --- a/resources/src/mediawiki/mediawiki.confirmCloseWindow.js +++ b/resources/src/mediawiki/mediawiki.confirmCloseWindow.js @@ -98,6 +98,7 @@ */ trigger: function () { // use confirm to show the message to the user (if options.text() is true) + // eslint-disable-next-line no-alert if ( options.test() && !confirm( message ) ) { // the user want to keep the actual page return false; diff --git a/resources/src/mediawiki/mediawiki.inspect.js b/resources/src/mediawiki/mediawiki.inspect.js index 638fba7e63..9332773e1f 100644 --- a/resources/src/mediawiki/mediawiki.inspect.js +++ b/resources/src/mediawiki/mediawiki.inspect.js @@ -183,6 +183,7 @@ // Use Function.prototype#call to force an exception on Firefox, // which doesn't define console#table but doesn't complain if you // try to invoke it. + // eslint-disable-next-line no-useless-call console.table.call( console, data ); return; } catch ( e ) {} diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js index 7a0de81d8e..06ea9bc58f 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js @@ -38,8 +38,10 @@ function isCssImportApplied() { // Trigger reflow, repaint, redraw, whatever (cross-browser) $element.css( 'height' ); + // eslint-disable-next-line no-unused-expressions el.innerHTML; el.className = el.className; + // eslint-disable-next-line no-unused-expressions document.documentElement.clientHeight; return $element.css( prop ) === val; diff --git a/tests/selenium/.eslintrc.json b/tests/selenium/.eslintrc.json index b2d0bdd9f2..d64ada9a6d 100644 --- a/tests/selenium/.eslintrc.json +++ b/tests/selenium/.eslintrc.json @@ -5,6 +5,9 @@ "mocha": true, "node": true }, + "parserOptions": { + "ecmaVersion": 6 + }, "globals": { "browser": false } -- 2.20.1