From: Prateek Saxena Date: Thu, 14 Dec 2017 07:44:50 +0000 (+0530) Subject: Use findItemFromData instead getItemFromData X-Git-Tag: 1.31.0-rc.0~940 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=f99649613d0b3e00a19c458c879faee2e9fee8c9;p=lhc%2Fweb%2Fwiklou.git Use findItemFromData instead getItemFromData Change-Id: I3cea1dacc1452b05e7e7423e47dcb2ffdf70c1ce Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 --- 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 3f47df2ee4..070ecf8bd9 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -476,7 +476,7 @@ this.controller.toggleFilterSelect( item.model.getName() ); // Select the tag if it exists, or reset selection otherwise - this.selectTag( this.getItemFromData( item.model.getName() ) ); + this.selectTag( this.findItemFromData( item.model.getName() ) ); this.focus(); }; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js index ad3b304851..64a7fcf08e 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js @@ -84,8 +84,8 @@ * @param {string} color Selected color */ mw.rcfilters.ui.HighlightColorPickerWidget.prototype.selectColor = function ( color ) { - var previousItem = this.buttonSelect.getItemFromData( this.currentSelection ), - selectedItem = this.buttonSelect.getItemFromData( color ); + var previousItem = this.buttonSelect.findItemFromData( this.currentSelection ), + selectedItem = this.buttonSelect.findItemFromData( color ); if ( this.currentSelection !== color ) { this.currentSelection = color; 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 71e3b55c01..060ead02d7 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js @@ -309,7 +309,7 @@ if ( this.default !== isDefault ) { this.default = isDefault; this.setIcon( this.default ? 'pushPin' : '' ); - this.menu.getItemFromData( 'default' ).setLabel( + this.menu.findItemFromData( 'default' ).setLabel( this.default ? mw.msg( 'rcfilters-savedqueries-unsetdefault' ) : mw.msg( 'rcfilters-savedqueries-setdefault' ) diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js index 8287ef96c0..7077434131 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js @@ -131,7 +131,7 @@ * @param {mw.rcfilters.ui.SavedLinksListItemWidget} item Menu item */ mw.rcfilters.ui.SavedLinksListWidget.prototype.onModelAddItem = function ( item ) { - if ( this.menu.getItemFromData( item.getID() ) ) { + if ( this.menu.findItemFromData( item.getID() ) ) { return; } @@ -147,7 +147,7 @@ * @param {mw.rcfilters.ui.SavedLinksListItemWidget} item Menu item */ mw.rcfilters.ui.SavedLinksListWidget.prototype.onModelRemoveItem = function ( item ) { - this.menu.removeItems( [ this.menu.getItemFromData( item.getID() ) ] ); + this.menu.removeItems( [ this.menu.findItemFromData( item.getID() ) ] ); this.placeholderItem.toggle( this.model.isEmpty() ); }; }( mediaWiki ) ); diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js index 5f680303b9..d14a47abc5 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js @@ -201,14 +201,14 @@ /** * @inheritdoc */ - mw.widgets.CategoryMultiselectWidget.prototype.getItemFromData = function ( data ) { + mw.widgets.CategoryMultiselectWidget.prototype.findItemFromData = function ( data ) { // This is a bit of a hack... We have to canonicalize the data in the same way that // #createItemWidget and CategoryCapsuleItemWidget will do, otherwise we won't find duplicates. var title = mw.Title.makeTitle( NS_CATEGORY, data ); if ( !title ) { return null; } - return OO.ui.mixin.GroupElement.prototype.getItemFromData.call( this, title.getMainText() ); + return OO.ui.mixin.GroupElement.prototype.findItemFromData.call( this, title.getMainText() ); }; /**