[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use findItemFromData instead getItemFromData

2018-01-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398221 )

Change subject: Use findItemFromData instead getItemFromData
..


Use findItemFromData instead getItemFromData

Change-Id: I3cea1dacc1452b05e7e7423e47dcb2ffdf70c1ce
Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f
Bug: T76630
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
M resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js
5 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



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
--- 
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
--- 
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
--- 
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
--- 
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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use findItemFromData instead getItemFromData

2017-12-13 Thread Prtksxna (Code Review) 
Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398221 )

Change subject: Use findItemFromData instead getItemFromData
..

Use findItemFromData instead getItemFromData

Change-Id: I3cea1dacc1452b05e7e7423e47dcb2ffdf70c1ce
Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f
Bug: T76630
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
M resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js
5 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/398221/1

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 91a2d5f..6db55d4 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -474,7 +474,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
--- 
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
--- 
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
--- 
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