Prtksxna has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398223 )
Change subject: Use findItem(s)FromData instead getItem(s)FromData
......................................................................
Use findItem(s)FromData instead getItem(s)FromData
Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f
Bug: T76630
Change-Id: Idea863e934f74bdf9a87868cbf9411f853ca11e8
---
M modules/ui/ext.advancedSearch.FileTypeSelection.js
M modules/ui/ext.advancedSearch.NamespaceFilters.js
M modules/ui/ext.advancedSearch.NamespacePresets.js
M tests/qunit/ui/NamespaceFilters.test.js
4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch
refs/changes/23/398223/1
diff --git a/modules/ui/ext.advancedSearch.FileTypeSelection.js
b/modules/ui/ext.advancedSearch.FileTypeSelection.js
index e3d2b10..dbb8152 100644
--- a/modules/ui/ext.advancedSearch.FileTypeSelection.js
+++ b/modules/ui/ext.advancedSearch.FileTypeSelection.js
@@ -41,7 +41,7 @@
mw.libs.advancedSearch.ui.FileTypeSelection.prototype.setValueFromStore
= function () {
var storeValue = this.store.getOption( this.optionId ),
- selectedItem =
this.dropdownWidget.getMenu().getItemFromData( storeValue );
+ selectedItem =
this.dropdownWidget.getMenu().findItemFromData( storeValue );
// avoid setting invalid values and re-triggering
if ( selectedItem === null || this.getValue() === storeValue ) {
return;
diff --git a/modules/ui/ext.advancedSearch.NamespaceFilters.js
b/modules/ui/ext.advancedSearch.NamespaceFilters.js
index 71db8ff..d3772f7 100644
--- a/modules/ui/ext.advancedSearch.NamespaceFilters.js
+++ b/modules/ui/ext.advancedSearch.NamespaceFilters.js
@@ -172,7 +172,7 @@
var self = this;
$.each( this.getMenu().getItems(), function ( index, menuItem )
{
- menuItem.setDisabled( !!self.getItemFromData(
menuItem.getData() ) );
+ menuItem.setDisabled( !!self.findItemFromData(
menuItem.getData() ) );
} );
};
diff --git a/modules/ui/ext.advancedSearch.NamespacePresets.js
b/modules/ui/ext.advancedSearch.NamespacePresets.js
index b83cfb3..edd2150 100644
--- a/modules/ui/ext.advancedSearch.NamespacePresets.js
+++ b/modules/ui/ext.advancedSearch.NamespacePresets.js
@@ -76,7 +76,7 @@
} );
this.checkboxMultiselectWidget.off( 'change',
this.updateStoreFromPresets, this );
$.each( selectedPresets, function ( key, isSelected ) {
- var presetWidget =
self.checkboxMultiselectWidget.getItemFromData( key );
+ var presetWidget =
self.checkboxMultiselectWidget.findItemFromData( key );
if ( presetWidget.isSelected() !== isSelected ) {
presetWidget.setSelected( isSelected );
}
diff --git a/tests/qunit/ui/NamespaceFilters.test.js
b/tests/qunit/ui/NamespaceFilters.test.js
index 76fd25a..e296636 100644
--- a/tests/qunit/ui/NamespaceFilters.test.js
+++ b/tests/qunit/ui/NamespaceFilters.test.js
@@ -40,8 +40,8 @@
menu = filter.getMenu();
assert.equal( menu.getItemCount(), 5 );
- var firstItem = menu.getItemFromData( 'test' ),
- lastItem = menu.getItemFromData( '3' );
+ var firstItem = menu.findItemFromData( 'test' ),
+ lastItem = menu.findItemFromData( '3' );
assert.ok( firstItem );
assert.ok( lastItem );
assert.equal( menu.getItemIndex( firstItem ), 0 );
@@ -61,8 +61,8 @@
} ),
menu = filter.getMenu();
assert.equal( menu.getItemCount(), 2 );
- assert.notOk( menu.getItemFromData( '0' ) );
- assert.notOk( menu.getItemFromData( '1' ) );
+ assert.notOk( menu.findItemFromData( '0' ) );
+ assert.notOk( menu.findItemFromData( '1' ) );
} );
QUnit.assert.namespaceElementsPresent = function ( element,
expectedNamespaces, message ) {
--
To view, visit https://gerrit.wikimedia.org/r/398223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idea863e934f74bdf9a87868cbf9411f853ca11e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
