From 28b4b1874a9bd703caad7885bb54b3d49c35be39 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Fri, 18 Jan 2019 16:39:25 +0000 Subject: [PATCH] Fix more jquery event shorthand usages Not yet caught by the linter. Change-Id: I9601bff47c099c4901487e7faaf871f23e2e2d1c --- resources/src/jquery/jquery.suggestions.js | 6 +++--- .../mediawiki.action.view.dblClickEdit.js | 2 +- .../ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js | 2 +- .../ui/mw.rcfilters.ui.RclTargetPageWidget.js | 2 +- .../ui/mw.rcfilters.ui.SavedLinksListItemWidget.js | 2 +- .../src/mediawiki.widgets.datetime/CalendarWidget.js | 6 +++--- .../mediawiki.widgets.datetime/DateTimeInputWidget.js | 2 +- .../mediawiki.widgets/mw.widgets.DateInputWidget.js | 10 +++++----- .../mediawiki.widgets/mw.widgets.SearchInputWidget.js | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/src/jquery/jquery.suggestions.js b/resources/src/jquery/jquery.suggestions.js index f2251f540c..01d2ba5d83 100644 --- a/resources/src/jquery/jquery.suggestions.js +++ b/resources/src/jquery/jquery.suggestions.js @@ -491,7 +491,7 @@ context.data.$textbox.val( result.data( 'text' ) ); // .val() doesn't call any event handlers, so // let the world know what happened - context.data.$textbox.change(); + context.data.$textbox.trigger( 'change' ); } context.data.$textbox.trigger( 'change' ); } @@ -682,7 +682,7 @@ } // Always bring focus to the textbox, as that's probably where the user expects it // if they were just typing. - context.data.$textbox.focus(); + context.data.$textbox.trigger( 'focus' ); } ) ) .append( @@ -715,7 +715,7 @@ } // Always bring focus to the textbox, as that's probably where the user expects it // if they were just typing. - context.data.$textbox.focus(); + context.data.$textbox.trigger( 'focus' ); } ) .on( 'mousemove', function ( e ) { context.data.selectedWithMouse = true; diff --git a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js index e359416a6a..1e7a6e48c3 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js +++ b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js @@ -3,7 +3,7 @@ */ ( function () { $( function () { - mw.util.$content.dblclick( function ( e ) { + mw.util.$content.on( 'dblclick', function ( e ) { var $a; // Recheck preference so extensions can do a hack to disable this code. if ( parseInt( mw.user.options.get( 'editondblclick' ), 10 ) ) { diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js index d0cc117bd6..6d45144600 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -385,7 +385,7 @@ mw.rcfilters.ui.FilterTagMultiselectWidget.parent.prototype.doInputEscape.call( this ); // Blur the input - this.input.$input.blur(); + this.input.$input.trigger( 'blur' ); }; /** diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js index 426c47fd26..dc76085ac2 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js @@ -57,7 +57,7 @@ * Respond to the user choosing a title */ mw.rcfilters.ui.RclTargetPageWidget.prototype.onLookupMenuItemChoose = function () { - this.titleSearch.$input.blur(); + this.titleSearch.$input.trigger( 'blur' ); }; /** diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js index 3882a95675..f1364d1563 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js @@ -294,7 +294,7 @@ this.saveButton.toggle( isEdit ); if ( isEdit ) { - this.editInput.$input.focus(); + this.editInput.$input.trigger( 'focus' ); } this.editing = isEdit; } diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js index 3ad6e293f9..b545164e73 100644 --- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js +++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js @@ -452,7 +452,7 @@ mw.widgets.datetime.CalendarWidget.prototype.onPrevClick = function () { this.setFocusedDate( this.adjustDate( this.getFocusedDate(), 'month', -1 ) ); if ( !this.$widget || OO.ui.contains( this.$element[ 0 ], document.activeElement, true ) ) { - this.$element.focus(); + this.$element.trigger( 'focus' ); } }; @@ -464,7 +464,7 @@ mw.widgets.datetime.CalendarWidget.prototype.onNextClick = function () { this.setFocusedDate( this.adjustDate( this.getFocusedDate(), 'month', 1 ) ); if ( !this.$widget || OO.ui.contains( this.$element[ 0 ], document.activeElement, true ) ) { - this.$element.focus(); + this.$element.trigger( 'focus' ); } }; @@ -478,7 +478,7 @@ this.setFocusedDate( $button.getData() ); this.setSelected( [ $button.getData() ] ); if ( !this.$widget || OO.ui.contains( this.$element[ 0 ], document.activeElement, true ) ) { - this.$element.focus(); + this.$element.trigger( 'focus' ); } }; diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js index f4ad57810a..fee27c56cb 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js +++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js @@ -815,7 +815,7 @@ */ mw.widgets.datetime.DateTimeInputWidget.prototype.focus = function () { if ( !this.getFocusedField().length ) { - this.$fields.find( '.mw-widgets-datetime-dateTimeInputWidget-editField' ).first().focus(); + this.$fields.find( '.mw-widgets-datetime-dateTimeInputWidget-editField' ).first().trigger( 'focus' ); } return this; }; diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js index 4d58f185c6..3a717605c3 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js @@ -202,7 +202,7 @@ // Tabbing backward from text input: normal browser behavior } else { // Tabbing forward from text input: just focus the calendar - this.calendar.$element.focus(); + this.calendar.$element.trigger( 'focus' ); return false; } } @@ -211,12 +211,12 @@ if ( e.which === OO.ui.Keys.TAB ) { if ( e.shiftKey ) { // Tabbing backward from calendar: just focus the text input - this.textInput.$input.focus(); + this.textInput.$input.trigger( 'focus' ); return false; } else { // Tabbing forward from calendar: focus the text input, then allow normal browser // behavior to move focus to next focusable after it - this.textInput.$input.focus(); + this.textInput.$input.trigger( 'focus' ); } } }.bind( this ) ); @@ -405,7 +405,7 @@ if ( userSelected ) { // Prevent focusing the handle from reopening the calendar this.closing = true; - this.$handle.focus(); + this.$handle.trigger( 'focus' ); this.closing = false; } @@ -424,7 +424,7 @@ this.textInput.toggle( true ); this.calendar.toggle( true ); - this.textInput.$input.focus(); + this.textInput.$input.trigger( 'focus' ); }; /** diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js index f1c0c6fe41..55d8cf5a86 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js @@ -233,7 +233,7 @@ mw.widgets.SearchInputWidget.parent.prototype.onLookupMenuItemChoose.apply( this, arguments ); if ( this.performSearchOnClick ) { - this.$element.closest( 'form' ).submit(); + this.$element.closest( 'form' ).trigger( 'submit' ); } }; -- 2.20.1