jenkins-bot has submitted this change and it was merged.
Change subject: DropdownWidget: Handle type-to-search when menu is not expanded
......................................................................
DropdownWidget: Handle type-to-search when menu is not expanded
I'm not sure about this change, both in the 'do we want this' sense
and in the 'should we do this more properly' sense. But it works.
Bug: T136537
Change-Id: Ifb51f6e923b27d708ac71da5dc359434a71589f7
---
M src/widgets/DropdownWidget.js
M src/widgets/SelectWidget.js
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js
index a5d8e7e..b892c05 100644
--- a/src/widgets/DropdownWidget.js
+++ b/src/widgets/DropdownWidget.js
@@ -80,7 +80,10 @@
// Events
this.$handle.on( {
click: this.onClick.bind( this ),
- keydown: this.onKeyDown.bind( this )
+ keydown: this.onKeyDown.bind( this ),
+ // Hack? Handle type-to-search when menu is not expanded and
not handling its own events
+ keypress: this.menu.onKeyPressHandler,
+ blur: this.menu.clearKeyPressBuffer.bind( this.menu )
} );
this.menu.connect( this, { select: 'onMenuSelect' } );
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 96883a3..bae5f04 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -415,7 +415,7 @@
item = this.getRelativeSelectableItem( item, 1, filter );
}
if ( item ) {
- if ( item.constructor.static.highlightable ) {
+ if ( this.isVisible() && item.constructor.static.highlightable
) {
this.highlightItem( item );
} else {
this.chooseItem( item );
--
To view, visit https://gerrit.wikimedia.org/r/291695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb51f6e923b27d708ac71da5dc359434a71589f7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
