Prtksxna has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398209 )
Change subject: Use findItem(s)FromData instead of getItem(s)FromData
......................................................................
Use findItem(s)FromData instead of getItem(s)FromData
Bug: T76630
Change-Id: I1ae2c3da6d1bf1b5c45f8937797661b3c10cd03a
---
M demos/classes/IndexedDialog.js
M src/layouts/BookletLayout.js
M src/layouts/IndexLayout.js
M src/widgets/CapsuleMultiselectWidget.js
M src/widgets/CheckboxMultiselectInputWidget.js
M src/widgets/ComboBoxInputWidget.js
M src/widgets/DropdownInputWidget.js
M src/widgets/MenuTagMultiselectWidget.js
M src/widgets/MultiselectWidget.js
M src/widgets/RadioSelectInputWidget.js
M src/widgets/SelectWidget.js
M src/widgets/TagMultiselectWidget.js
12 files changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/398209/1
diff --git a/demos/classes/IndexedDialog.js b/demos/classes/IndexedDialog.js
index c2d437f..ac93224 100644
--- a/demos/classes/IndexedDialog.js
+++ b/demos/classes/IndexedDialog.js
@@ -33,7 +33,7 @@
this.indexLayout.addTabPanels( this.tabPanels );
this.$body.append( this.indexLayout.$element );
- this.indexLayout.getTabs().getItemFromData( 'fourth' ).setDisabled(
true );
+ this.indexLayout.getTabs().findItemFromData( 'fourth' ).setDisabled(
true );
};
Demo.IndexedDialog.prototype.getActionProcess = function ( action ) {
if ( action ) {
diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 4fb4d5b..c53017a 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -323,16 +323,16 @@
prev = pages[ index - 1 ];
// Prefer adjacent pages at the same level
if ( this.outlined ) {
- level = this.outlineSelectWidget.getItemFromData(
page.getName() ).getLevel();
+ level = this.outlineSelectWidget.findItemFromData(
page.getName() ).getLevel();
if (
prev &&
- level ===
this.outlineSelectWidget.getItemFromData( prev.getName() ).getLevel()
+ level ===
this.outlineSelectWidget.findItemFromData( prev.getName() ).getLevel()
) {
return prev;
}
if (
next &&
- level ===
this.outlineSelectWidget.getItemFromData( next.getName() ).getLevel()
+ level ===
this.outlineSelectWidget.findItemFromData( next.getName() ).getLevel()
) {
return next;
}
@@ -467,7 +467,7 @@
name = page.getName();
delete this.pages[ name ];
if ( this.outlined ) {
- items.push( this.outlineSelectWidget.getItemFromData(
name ) );
+ items.push( this.outlineSelectWidget.findItemFromData(
name ) );
page.setOutlineItem( null );
}
}
diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js
index 22bcc1a..12fb1b5 100644
--- a/src/layouts/IndexLayout.js
+++ b/src/layouts/IndexLayout.js
@@ -213,16 +213,16 @@
next = tabPanels[ index + 1 ];
prev = tabPanels[ index - 1 ];
// Prefer adjacent tab panels at the same level
- level = this.tabSelectWidget.getItemFromData(
tabPanel.getName() ).getLevel();
+ level = this.tabSelectWidget.findItemFromData(
tabPanel.getName() ).getLevel();
if (
prev &&
- level === this.tabSelectWidget.getItemFromData(
prev.getName() ).getLevel()
+ level === this.tabSelectWidget.findItemFromData(
prev.getName() ).getLevel()
) {
return prev;
}
if (
next &&
- level === this.tabSelectWidget.getItemFromData(
next.getName() ).getLevel()
+ level === this.tabSelectWidget.findItemFromData(
next.getName() ).getLevel()
) {
return next;
}
@@ -340,7 +340,7 @@
tabPanel = tabPanels[ i ];
name = tabPanel.getName();
delete this.tabPanels[ name ];
- items.push( this.tabSelectWidget.getItemFromData( name ) );
+ items.push( this.tabSelectWidget.findItemFromData( name ) );
tabPanel.setTabItem( null );
}
if ( items.length ) {
diff --git a/src/widgets/CapsuleMultiselectWidget.js
b/src/widgets/CapsuleMultiselectWidget.js
index 5509050..e515a8b 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -274,7 +274,7 @@
$.each( datas, function ( i, data ) {
var j, label,
- item = menu.getItemFromData( data );
+ item = menu.findItemFromData( data );
if ( item ) {
label = item.label;
@@ -322,8 +322,8 @@
$.each( datas, function ( i, data ) {
var item;
- if ( !widget.getItemFromData( data ) || widget.allowDuplicates
) {
- item = menu.getItemFromData( data );
+ if ( !widget.findItemFromData( data ) || widget.allowDuplicates
) {
+ item = menu.findItemFromData( data );
if ( item ) {
item = widget.createItemWidget( data,
item.label );
} else if ( widget.allowArbitrary ) {
@@ -374,7 +374,7 @@
items = [];
$.each( datas, function ( i, data ) {
- var item = widget.getItemFromData( data );
+ var item = widget.findItemFromData( data );
if ( item ) {
items.push( item );
}
diff --git a/src/widgets/CheckboxMultiselectInputWidget.js
b/src/widgets/CheckboxMultiselectInputWidget.js
index 7e3632f..d923451 100644
--- a/src/widgets/CheckboxMultiselectInputWidget.js
+++ b/src/widgets/CheckboxMultiselectInputWidget.js
@@ -129,7 +129,7 @@
singleValue =
OO.ui.CheckboxMultiselectInputWidget.parent.prototype.cleanUpValue.call( this,
value[ i ] );
// Remove options that we don't have here
- if ( !this.checkboxMultiselectWidget.getItemFromData(
singleValue ) ) {
+ if ( !this.checkboxMultiselectWidget.findItemFromData(
singleValue ) ) {
continue;
}
cleanValue.push( singleValue );
diff --git a/src/widgets/ComboBoxInputWidget.js
b/src/widgets/ComboBoxInputWidget.js
index f4206f3..ed9cd3a 100644
--- a/src/widgets/ComboBoxInputWidget.js
+++ b/src/widgets/ComboBoxInputWidget.js
@@ -163,7 +163,7 @@
* @param {string} value New value
*/
OO.ui.ComboBoxInputWidget.prototype.onInputChange = function ( value ) {
- var match = this.menu.getItemFromData( value );
+ var match = this.menu.findItemFromData( value );
this.menu.selectItem( match );
if ( this.menu.findHighlightedItem() ) {
@@ -212,7 +212,7 @@
* @private
*/
OO.ui.ComboBoxInputWidget.prototype.onMenuItemsChange = function () {
- var match = this.menu.getItemFromData( this.getValue() );
+ var match = this.menu.findItemFromData( this.getValue() );
this.menu.selectItem( match );
if ( this.menu.findHighlightedItem() ) {
this.menu.highlightItem( match );
diff --git a/src/widgets/DropdownInputWidget.js
b/src/widgets/DropdownInputWidget.js
index 398666f..c976cf0 100644
--- a/src/widgets/DropdownInputWidget.js
+++ b/src/widgets/DropdownInputWidget.js
@@ -86,7 +86,7 @@
var selected;
value = this.cleanUpValue( value );
// Only allow setting values that are actually present in the dropdown
- selected = this.dropdownWidget.getMenu().getItemFromData( value ) ||
+ selected = this.dropdownWidget.getMenu().findItemFromData( value ) ||
this.dropdownWidget.getMenu().findFirstSelectableItem();
this.dropdownWidget.getMenu().selectItem( selected );
value = selected ? selected.getData() : '';
@@ -151,7 +151,7 @@
this.dropdownWidget.getMenu().addItems( optionWidgets );
// Restore the previous value, or reset to something sensible
- if ( this.dropdownWidget.getMenu().getItemFromData( value ) ) {
+ if ( this.dropdownWidget.getMenu().findItemFromData( value ) ) {
// Previous value is still available, ensure consistency with
the dropdown
this.setValue( value );
} else {
diff --git a/src/widgets/MenuTagMultiselectWidget.js
b/src/widgets/MenuTagMultiselectWidget.js
index ce74690..fd3dc57 100644
--- a/src/widgets/MenuTagMultiselectWidget.js
+++ b/src/widgets/MenuTagMultiselectWidget.js
@@ -130,7 +130,7 @@
* @inheritdoc
*/
OO.ui.MenuTagMultiselectWidget.prototype.onTagSelect = function ( tagItem ) {
- var menuItem = this.menu.getItemFromData( tagItem.getData() );
+ var menuItem = this.menu.findItemFromData( tagItem.getData() );
// Override the base behavior from TagMultiselectWidget; the base
behavior
// in TagMultiselectWidget is to remove the tag to edit it in the input,
// but in our case, we want to utilize the menu selection behavior, and
@@ -149,7 +149,7 @@
var inputValue = this.input.getValue(),
validated = false,
highlightedItem = this.menu.findHighlightedItem(),
- item = this.menu.getItemFromData( inputValue );
+ item = this.menu.findItemFromData( inputValue );
// Override the parent method so we add from the menu
// rather than directly from the input
diff --git a/src/widgets/MultiselectWidget.js b/src/widgets/MultiselectWidget.js
index 98c1645..dd0496d 100644
--- a/src/widgets/MultiselectWidget.js
+++ b/src/widgets/MultiselectWidget.js
@@ -106,7 +106,7 @@
var items,
widget = this;
items = datas.map( function ( data ) {
- return widget.getItemFromData( data );
+ return widget.findItemFromData( data );
} );
this.selectItems( items );
return this;
diff --git a/src/widgets/RadioSelectInputWidget.js
b/src/widgets/RadioSelectInputWidget.js
index 85eaa2f..8cf6adb 100644
--- a/src/widgets/RadioSelectInputWidget.js
+++ b/src/widgets/RadioSelectInputWidget.js
@@ -134,7 +134,7 @@
} ) );
// Restore the previous value, or reset to something sensible
- if ( this.radioSelectWidget.getItemFromData( value ) ) {
+ if ( this.radioSelectWidget.findItemFromData( value ) ) {
// Previous value is still available, ensure consistency with
the radioSelect
this.setValue( value );
} else {
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 40b35d8..5687b4f 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -671,7 +671,7 @@
* @chainable
*/
OO.ui.SelectWidget.prototype.selectItemByData = function ( data ) {
- var itemFromData = this.getItemFromData( data );
+ var itemFromData = this.findItemFromData( data );
if ( data === undefined || !itemFromData ) {
return this.selectItem();
}
diff --git a/src/widgets/TagMultiselectWidget.js
b/src/widgets/TagMultiselectWidget.js
index 0db4fea..9cfeba2 100644
--- a/src/widgets/TagMultiselectWidget.js
+++ b/src/widgets/TagMultiselectWidget.js
@@ -486,7 +486,7 @@
* @return {boolean} Value is duplicate
*/
OO.ui.TagMultiselectWidget.prototype.isDuplicateData = function ( data ) {
- return !!this.getItemFromData( data );
+ return !!this.findItemFromData( data );
};
/**
@@ -611,7 +611,7 @@
* @param {string|Object} data Tag data
*/
OO.ui.TagMultiselectWidget.prototype.removeTagByData = function ( data ) {
- var item = this.getItemFromData( data );
+ var item = this.findItemFromData( data );
this.removeItems( [ item ] );
};
--
To view, visit https://gerrit.wikimedia.org/r/398209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ae2c3da6d1bf1b5c45f8937797661b3c10cd03a
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
