Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403934 )
Change subject: Follow-Up I0f1d9c1f: Update usages of getSelectedItem ->
findSelectedItem
......................................................................
Follow-Up I0f1d9c1f: Update usages of getSelectedItem -> findSelectedItem
Change-Id: I421a4730cfd4a260b75d94c8dd0ad3b63de1a15b
---
M demos/demo.js
M src/layouts/BookletLayout.js
M src/layouts/IndexLayout.js
M src/mixins/LookupElement.js
M src/widgets/CheckboxMultiselectInputWidget.js
M src/widgets/DropdownWidget.js
M src/widgets/MenuSelectWidget.js
M src/widgets/OutlineControlsWidget.js
M src/widgets/SearchWidget.js
M src/widgets/SelectWidget.js
10 files changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/34/403934/1
diff --git a/demos/demo.js b/demos/demo.js
index 9ee3e12..a4f89f1 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -297,10 +297,10 @@
* Will load a new page.
*/
Demo.prototype.onModeChange = function () {
- var page = this.pageMenu.getSelectedItem().getData(),
- theme = this.themeSelect.getSelectedItem().getData(),
- direction = this.directionSelect.getSelectedItem().getData(),
- platform = this.platformSelect.getSelectedItem().getData();
+ var page = this.pageMenu.findSelectedItem().getData(),
+ theme = this.themeSelect.findSelectedItem().getData(),
+ direction = this.directionSelect.findSelectedItem().getData(),
+ platform = this.platformSelect.findSelectedItem().getData();
history.pushState( null, document.title, this.getUrlQuery( [ page,
theme, direction, platform ] ) );
$( window ).triggerHandler( 'popstate' );
diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index c53017a..cb97338 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -522,7 +522,7 @@
if ( name !== this.currentPageName ) {
if ( this.outlined ) {
- selectedItem =
this.outlineSelectWidget.getSelectedItem();
+ selectedItem =
this.outlineSelectWidget.findSelectedItem();
if ( selectedItem && selectedItem.getData() !== name ) {
this.outlineSelectWidget.selectItemByData( name
);
}
@@ -568,7 +568,7 @@
* @chainable
*/
OO.ui.BookletLayout.prototype.selectFirstSelectablePage = function () {
- if ( !this.outlineSelectWidget.getSelectedItem() ) {
+ if ( !this.outlineSelectWidget.findSelectedItem() ) {
this.outlineSelectWidget.selectItem(
this.outlineSelectWidget.findFirstSelectableItem() );
}
diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js
index 12fb1b5..4cc5aaf 100644
--- a/src/layouts/IndexLayout.js
+++ b/src/layouts/IndexLayout.js
@@ -391,7 +391,7 @@
previousTabPanel = this.currentTabPanelName && this.tabPanels[
this.currentTabPanelName ];
if ( name !== this.currentTabPanelName ) {
- selectedItem = this.tabSelectWidget.getSelectedItem();
+ selectedItem = this.tabSelectWidget.findSelectedItem();
if ( selectedItem && selectedItem.getData() !== name ) {
this.tabSelectWidget.selectItemByData( name );
}
@@ -436,7 +436,7 @@
* @chainable
*/
OO.ui.IndexLayout.prototype.selectFirstSelectableTabPanel = function () {
- if ( !this.tabSelectWidget.getSelectedItem() ) {
+ if ( !this.tabSelectWidget.findSelectedItem() ) {
this.tabSelectWidget.selectItem(
this.tabSelectWidget.findFirstSelectableItem() );
}
diff --git a/src/mixins/LookupElement.js b/src/mixins/LookupElement.js
index 1041911..3c9be7e 100644
--- a/src/mixins/LookupElement.js
+++ b/src/mixins/LookupElement.js
@@ -248,7 +248,7 @@
* @chainable
*/
OO.ui.mixin.LookupElement.prototype.initializeLookupMenuSelection = function
() {
- if ( this.lookupHighlightFirstItem &&
!this.lookupMenu.getSelectedItem() ) {
+ if ( this.lookupHighlightFirstItem &&
!this.lookupMenu.findSelectedItem() ) {
this.lookupMenu.highlightItem(
this.lookupMenu.findFirstSelectableItem() );
}
};
diff --git a/src/widgets/CheckboxMultiselectInputWidget.js
b/src/widgets/CheckboxMultiselectInputWidget.js
index 9efe27d..01fc9cd 100644
--- a/src/widgets/CheckboxMultiselectInputWidget.js
+++ b/src/widgets/CheckboxMultiselectInputWidget.js
@@ -50,7 +50,7 @@
// setValue when checkboxMultiselectWidget changes
this.checkboxMultiselectWidget.on( 'change', function () {
- this.setValue(
this.checkboxMultiselectWidget.getSelectedItemsData() );
+ this.setValue(
this.checkboxMultiselectWidget.findSelectedItemsData() );
}.bind( this ) );
};
diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js
index 5674e2e..67dfc0f 100644
--- a/src/widgets/DropdownWidget.js
+++ b/src/widgets/DropdownWidget.js
@@ -32,7 +32,7 @@
*
* dropDown.getMenu().selectItemByData( 'b' );
*
- * dropDown.getMenu().getSelectedItem().getData(); // returns 'b'
+ * dropDown.getMenu().findSelectedItem().getData(); // returns 'b'
*
* For more information, please see the [OOUI documentation on MediaWiki] [1].
*
diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index 9a2a10e..4d94333 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -119,7 +119,7 @@
* @inheritdoc
*/
OO.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) {
- var currentItem = this.findHighlightedItem() || this.getSelectedItem();
+ var currentItem = this.findHighlightedItem() || this.findSelectedItem();
if ( !this.isDisabled() && this.isVisible() ) {
switch ( e.keyCode ) {
@@ -375,9 +375,9 @@
this.$focusOwner.attr( 'aria-expanded', 'true' );
- if ( this.getSelectedItem() ) {
- this.$focusOwner.attr( 'aria-activedescendant',
this.getSelectedItem().getElementId() );
- this.getSelectedItem().scrollElementIntoView( {
duration: 0 } );
+ if ( this.findSelectedItem() ) {
+ this.$focusOwner.attr( 'aria-activedescendant',
this.findSelectedItem().getElementId() );
+ this.findSelectedItem().scrollElementIntoView(
{ duration: 0 } );
}
// Auto-hide
diff --git a/src/widgets/OutlineControlsWidget.js
b/src/widgets/OutlineControlsWidget.js
index dce3608..a60c709 100644
--- a/src/widgets/OutlineControlsWidget.js
+++ b/src/widgets/OutlineControlsWidget.js
@@ -119,7 +119,7 @@
OO.ui.OutlineControlsWidget.prototype.onOutlineChange = function () {
var i, len, firstMovable, lastMovable,
items = this.outline.getItems(),
- selectedItem = this.outline.getSelectedItem(),
+ selectedItem = this.outline.findSelectedItem(),
movable = this.abilities.move && selectedItem &&
selectedItem.isMovable(),
removable = this.abilities.remove && selectedItem &&
selectedItem.isRemovable();
diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js
index c30b5c4..662b660 100644
--- a/src/widgets/SearchWidget.js
+++ b/src/widgets/SearchWidget.js
@@ -73,7 +73,7 @@
if ( dir ) {
highlightedItem = this.results.findHighlightedItem();
if ( !highlightedItem ) {
- highlightedItem = this.results.getSelectedItem();
+ highlightedItem = this.results.findSelectedItem();
}
nextItem = this.results.findRelativeSelectableItem(
highlightedItem, dir );
this.results.highlightItem( nextItem );
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 6e2a54e..a26f0df 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -152,7 +152,7 @@
if ( event.target === this.$element[ 0 ] ) {
// This widget was focussed, e.g. by the user tabbing to it.
// The styles for focus state depend on one of the items being
selected.
- if ( !this.getSelectedItem() ) {
+ if ( !this.findSelectedItem() ) {
item = this.findFirstSelectableItem();
}
} else {
@@ -289,7 +289,7 @@
OO.ui.SelectWidget.prototype.onKeyDown = function ( e ) {
var nextItem,
handled = false,
- currentItem = this.findHighlightedItem() ||
this.getSelectedItem();
+ currentItem = this.findHighlightedItem() ||
this.findSelectedItem();
if ( !this.isDisabled() && this.isVisible() ) {
switch ( e.keyCode ) {
@@ -415,7 +415,7 @@
}
this.keyPressBufferTimer = setTimeout( this.clearKeyPressBuffer.bind(
this ), 1500 );
- item = this.findHighlightedItem() || this.getSelectedItem();
+ item = this.findHighlightedItem() || this.findSelectedItem();
if ( this.keyPressBuffer === c ) {
// Common (if weird) special case: typing "xxxx" will cycle
through all
--
To view, visit https://gerrit.wikimedia.org/r/403934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I421a4730cfd4a260b75d94c8dd0ad3b63de1a15b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
