Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376182 )
Change subject: SelectWidget: Rename getHighlightedItem to findHighlightedItem ...................................................................... SelectWidget: Rename getHighlightedItem to findHighlightedItem No need for deprecation or breaking change since this is not being used anywhere else. Bug: T76630 Change-Id: If5d05ace671c028eb27a19913fd3b6cb6704fbed --- M src/widgets/ComboBoxInputWidget.js M src/widgets/MenuSelectWidget.js M src/widgets/MenuTagMultiselectWidget.js M src/widgets/SearchWidget.js M src/widgets/SelectWidget.js 5 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/82/376182/1 diff --git a/src/widgets/ComboBoxInputWidget.js b/src/widgets/ComboBoxInputWidget.js index 3ef7793..cfba538 100644 --- a/src/widgets/ComboBoxInputWidget.js +++ b/src/widgets/ComboBoxInputWidget.js @@ -165,7 +165,7 @@ var match = this.menu.getItemFromData( value ); this.menu.selectItem( match ); - if ( this.menu.getHighlightedItem() ) { + if ( this.menu.findHighlightedItem() ) { this.menu.highlightItem( match ); } @@ -213,7 +213,7 @@ OO.ui.ComboBoxInputWidget.prototype.onMenuItemsChange = function () { var match = this.menu.getItemFromData( this.getValue() ); this.menu.selectItem( match ); - if ( this.menu.getHighlightedItem() ) { + if ( this.menu.findHighlightedItem() ) { this.menu.highlightItem( match ); } this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-empty', this.menu.isEmpty() ); diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js index 3823021..da3f9f5 100644 --- a/src/widgets/MenuSelectWidget.js +++ b/src/widgets/MenuSelectWidget.js @@ -119,7 +119,7 @@ * @inheritdoc */ OO.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) { - var currentItem = this.getHighlightedItem() || this.getSelectedItem(); + var currentItem = this.findHighlightedItem() || this.getSelectedItem(); if ( !this.isDisabled() && this.isVisible() ) { switch ( e.keyCode ) { diff --git a/src/widgets/MenuTagMultiselectWidget.js b/src/widgets/MenuTagMultiselectWidget.js index 6cca479..ce74690 100644 --- a/src/widgets/MenuTagMultiselectWidget.js +++ b/src/widgets/MenuTagMultiselectWidget.js @@ -148,7 +148,7 @@ OO.ui.MenuTagMultiselectWidget.prototype.addTagFromInput = function () { var inputValue = this.input.getValue(), validated = false, - highlightedItem = this.menu.getHighlightedItem(), + highlightedItem = this.menu.findHighlightedItem(), item = this.menu.getItemFromData( inputValue ); // Override the parent method so we add from the menu diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js index fbce361..4a257d0 100644 --- a/src/widgets/SearchWidget.js +++ b/src/widgets/SearchWidget.js @@ -71,7 +71,7 @@ dir = e.which === OO.ui.Keys.DOWN ? 1 : ( e.which === OO.ui.Keys.UP ? -1 : 0 ); if ( dir ) { - highlightedItem = this.results.getHighlightedItem(); + highlightedItem = this.results.findHighlightedItem(); if ( !highlightedItem ) { highlightedItem = this.results.getSelectedItem(); } @@ -103,7 +103,7 @@ * @param {string} value New value */ OO.ui.SearchWidget.prototype.onQueryEnter = function () { - var highlightedItem = this.results.getHighlightedItem(); + var highlightedItem = this.results.findHighlightedItem(); if ( highlightedItem ) { this.results.chooseItem( highlightedItem ); } diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index fc5040a..f1770a4 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -282,7 +282,7 @@ OO.ui.SelectWidget.prototype.onKeyDown = function ( e ) { var nextItem, handled = false, - currentItem = this.getHighlightedItem() || this.getSelectedItem(); + currentItem = this.findHighlightedItem() || this.getSelectedItem(); if ( !this.isDisabled() && this.isVisible() ) { switch ( e.keyCode ) { @@ -408,7 +408,7 @@ } this.keyPressBufferTimer = setTimeout( this.clearKeyPressBuffer.bind( this ), 1500 ); - item = this.getHighlightedItem() || this.getSelectedItem(); + item = this.findHighlightedItem() || this.getSelectedItem(); if ( this.keyPressBuffer === c ) { // Common (if weird) special case: typing "xxxx" will cycle through all @@ -532,11 +532,11 @@ }; /** - * Get highlighted item. + * Find highlighted item. * * @return {OO.ui.OptionWidget|null} Highlighted item, `null` if no item is highlighted */ -OO.ui.SelectWidget.prototype.getHighlightedItem = function () { +OO.ui.SelectWidget.prototype.findHighlightedItem = function () { var i, len; for ( i = 0, len = this.items.length; i < len; i++ ) { -- To view, visit https://gerrit.wikimedia.org/r/376182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5d05ace671c028eb27a19913fd3b6cb6704fbed Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna <psax...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits