From 7ed0113e3fc53245e248d616f94246745ea2f67e Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Tue, 27 Nov 2018 22:36:25 +0000 Subject: [PATCH] eslint: Drop 'dot-notation' rule Bug: T210552 Change-Id: I07620ed2e3a1acfd3193e411c8369722ae751ffa --- .eslintrc.json | 1 - resources/src/mediawiki.debug/debug.js | 2 +- .../apisandbox.js | 30 +++++++++---------- .../CalendarWidget.js | 4 +-- .../DateTimeInputWidget.js | 4 +-- .../DiscordianDateTimeFormatter.js | 4 +-- .../ProlepticGregorianDateTimeFormatter.js | 4 +-- .../mediawiki/mediawiki.loader.test.js | 4 +-- 8 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 99d7730958..97f7c31248 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,7 +10,6 @@ "OO": false }, "rules": { - "dot-notation": 0, "max-len": 0 } } diff --git a/resources/src/mediawiki.debug/debug.js b/resources/src/mediawiki.debug/debug.js index f1e829c316..32dbdc199e 100644 --- a/resources/src/mediawiki.debug/debug.js +++ b/resources/src/mediawiki.debug/debug.js @@ -307,7 +307,7 @@ .append( $( '' ).text( i + 1 ) ) .append( $( '' ).text( query.sql ) ) .append( $( '' ).text( ( query.time * 1000 ).toFixed( 4 ) + 'ms' ).addClass( 'stats' ) ) - .append( $( '' ).text( query[ 'function' ] ) ) + .append( $( '' ).text( query.function ) ) .appendTo( $table ); } diff --git a/resources/src/mediawiki.special.apisandbox/apisandbox.js b/resources/src/mediawiki.special.apisandbox/apisandbox.js index 52bcd30fc1..3762ae73ce 100644 --- a/resources/src/mediawiki.special.apisandbox/apisandbox.js +++ b/resources/src/mediawiki.special.apisandbox/apisandbox.js @@ -33,7 +33,7 @@ this.checkbox = new OO.ui.CheckboxInputWidget( config.checkbox ) .on( 'change', this.onCheckboxChange, [], this ); - OptionalWidget[ 'super' ].call( this, config ); + OptionalWidget.super.call( this, config ); // Forward most methods for convenience for ( k in this.widget ) { @@ -75,7 +75,7 @@ } }; OptionalWidget.prototype.setDisabled = function ( disabled ) { - OptionalWidget[ 'super' ].prototype.setDisabled.call( this, disabled ); + OptionalWidget.super.prototype.setDisabled.call( this, disabled ); this.widget.setDisabled( this.isDisabled() ); this.checkbox.setSelected( !this.isDisabled() ); this.$cover.toggle( this.isDisabled() ); @@ -90,7 +90,7 @@ }, setApiValue: function ( v ) { if ( v === undefined ) { - v = this.paramInfo[ 'default' ]; + v = this.paramInfo.default; } this.setValue( v ); }, @@ -174,7 +174,7 @@ var menu = this.getMenu(); if ( v === undefined ) { - v = this.paramInfo[ 'default' ]; + v = this.paramInfo.default; } if ( v === undefined ) { menu.selectItem(); @@ -204,7 +204,7 @@ } }, getApiValueForTemplates: function () { - return this.isDisabled() ? this.parseApiValue( this.paramInfo[ 'default' ] ) : this.getValue(); + return this.isDisabled() ? this.parseApiValue( this.paramInfo.default ) : this.getValue(); }, getApiValue: function () { var items = this.getValue(); @@ -216,7 +216,7 @@ }, setApiValue: function ( v ) { if ( v === undefined ) { - v = this.paramInfo[ 'default' ]; + v = this.paramInfo.default; } this.setValue( this.parseApiValue( v ) ); }, @@ -266,12 +266,12 @@ submoduleWidget: { single: function () { - var v = this.isDisabled() ? this.paramInfo[ 'default' ] : this.getApiValue(); + var v = this.isDisabled() ? this.paramInfo.default : this.getApiValue(); return v === undefined ? [] : [ { value: v, path: this.paramInfo.submodules[ v ] } ]; }, multi: function () { var map = this.paramInfo.submodules, - v = this.isDisabled() ? this.paramInfo[ 'default' ] : this.getApiValue(); + v = this.isDisabled() ? this.paramInfo.default : this.getApiValue(); return v === undefined || v === '' ? [] : String( v ).split( '|' ).map( function ( v ) { return { value: v, path: map[ v ] }; } ); @@ -672,7 +672,7 @@ finalWidget.setDisabled( true ); } - widget.setApiValue( pi[ 'default' ] ); + widget.setApiValue( pi.default ); return finalWidget; }, @@ -1207,14 +1207,14 @@ .text( data ) .appendTo( $result ); } - if ( paramsAreForced || data[ 'continue' ] ) { + if ( paramsAreForced || data.continue ) { $result.append( $( '
' ).append( new OO.ui.ButtonWidget( { label: mw.message( 'apisandbox-continue' ).text() } ).on( 'click', function () { - ApiSandbox.sendRequest( $.extend( {}, baseRequestParams, data[ 'continue' ] ) ); - } ).setDisabled( !data[ 'continue' ] ).$element, + ApiSandbox.sendRequest( $.extend( {}, baseRequestParams, data.continue ) ); + } ).setDisabled( !data.continue ).$element, ( clear = new OO.ui.ButtonWidget( { label: mw.message( 'apisandbox-continue-clear' ).text() } ).on( 'click', function () { @@ -1355,7 +1355,7 @@ this.templatedItemsCache = {}; this.tokenWidget = null; this.indentLevel = config.indentLevel ? config.indentLevel : 0; - ApiSandbox.PageLayout[ 'super' ].call( this, config.key, config ); + ApiSandbox.PageLayout.super.call( this, config.key, config ); this.loadParamInfo(); }; OO.inheritClass( ApiSandbox.PageLayout, OO.ui.PageLayout ); @@ -1805,7 +1805,7 @@ for ( i = 0; i < pi.parameters.length; i++ ) { if ( pi.parameters[ i ].name === 'action' ) { pi.parameters[ i ].required = true; - delete pi.parameters[ i ][ 'default' ]; + delete pi.parameters[ i ].default; } if ( pi.parameters[ i ].name === 'format' ) { tmp = pi.parameters[ i ].type; @@ -1813,7 +1813,7 @@ availableFormats[ tmp[ j ] ] = true; } pi.parameters[ i ].type = tmp.filter( filterFmModules ); - pi.parameters[ i ][ 'default' ] = 'json'; + pi.parameters[ i ].default = 'json'; pi.parameters[ i ].required = true; } } diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js index 0d664e4b55..3ad6e293f9 100644 --- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js +++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js @@ -40,7 +40,7 @@ }, config ); // Parent constructor - mw.widgets.datetime.CalendarWidget[ 'super' ].call( this, config ); + mw.widgets.datetime.CalendarWidget.super.call( this, config ); // Mixin constructors OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$element } ) ); @@ -574,7 +574,7 @@ change = visible !== this.isVisible(); // Parent method - mw.widgets.datetime.CalendarWidget[ 'super' ].prototype.toggle.call( this, visible ); + mw.widgets.datetime.CalendarWidget.super.prototype.toggle.call( this, visible ); if ( change ) { if ( visible ) { diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js index db9b7d6d03..ef7cea9081 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js +++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js @@ -64,7 +64,7 @@ this.type = config.type; // Parent constructor - mw.widgets.datetime.DateTimeInputWidget[ 'super' ].call( this, config ); + mw.widgets.datetime.DateTimeInputWidget.super.call( this, config ); // Mixin constructors OO.ui.mixin.IconElement.call( this, config ); @@ -795,7 +795,7 @@ * @inheritdoc */ mw.widgets.datetime.DateTimeInputWidget.prototype.setDisabled = function ( disabled ) { - mw.widgets.datetime.DateTimeInputWidget[ 'super' ].prototype.setDisabled.call( this, disabled ); + mw.widgets.datetime.DateTimeInputWidget.super.prototype.setDisabled.call( this, disabled ); // Flag all our fields as disabled if ( this.$fields ) { diff --git a/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js index 66355760dc..c64a55025b 100644 --- a/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js +++ b/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js @@ -20,7 +20,7 @@ config = $.extend( {}, config ); // Parent constructor - mw.widgets.datetime.DiscordianDateTimeFormatter[ 'super' ].call( this, config ); + mw.widgets.datetime.DiscordianDateTimeFormatter.super.call( this, config ); }; /* Setup */ @@ -170,7 +170,7 @@ break; default: - return mw.widgets.datetime.DiscordianDateTimeFormatter[ 'super' ].prototype.getFieldForTag.call( this, tag, params ); + return mw.widgets.datetime.DiscordianDateTimeFormatter.super.prototype.getFieldForTag.call( this, tag, params ); } if ( spec ) { diff --git a/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js index aaf8817d7e..06dd2d5025 100644 --- a/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js +++ b/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js @@ -70,7 +70,7 @@ }, config ); // Parent constructor - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'super' ].call( this, config ); + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.super.call( this, config ); // Properties this.weekStartsOn = config.weekStartsOn % 7; @@ -379,7 +379,7 @@ break; default: - return mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'super' ].prototype.getFieldForTag.call( this, tag, params ); + return mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.super.prototype.getFieldForTag.call( this, tag, params ); } if ( spec ) { diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js index 347614c4c3..11182799b5 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js @@ -1050,8 +1050,8 @@ assert.strictEqual( siteFromUser, 1, 'site ran before user' ); } ).always( function () { // Reset - mw.loader.moduleRegistry[ 'site' ].state = 'registered'; - mw.loader.moduleRegistry[ 'user' ].state = 'registered'; + mw.loader.moduleRegistry.site.state = 'registered'; + mw.loader.moduleRegistry.user.state = 'registered'; } ); } ); -- 2.20.1