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 3f47df2..070ecf8 100644 (file)
--- 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 ad3b304..64a7fcf 100644 (file)
--- 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 71e3b55..060ead0 100644 (file)
--- 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 8287ef9..7077434 100644 (file)
--- 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 5f68030..d14a47a 100644 (file)
--- 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() );
        };
 
        /**