jenkins-bot has submitted this change and it was merged.
Change subject: ComboBoxWidget: Append menu to $overlay option
......................................................................
ComboBoxWidget: Append menu to $overlay option
Bug: 71178
Change-Id: I0a39ae702e3fccf5bfb6d27299bd640ac2fa5c94
---
M src/widgets/ComboBoxWidget.js
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/ComboBoxWidget.js b/src/widgets/ComboBoxWidget.js
index 3ea9a2e..65e3793 100644
--- a/src/widgets/ComboBoxWidget.js
+++ b/src/widgets/ComboBoxWidget.js
@@ -8,6 +8,7 @@
* @param {Object} [config] Configuration options
* @cfg {Object} [menu] Configuration options to pass to menu widget
* @cfg {Object} [input] Configuration options to pass to input widget
+ * @cfg {jQuery} [$overlay] Overlay layer; defaults to the current window's
overlay.
*/
OO.ui.ComboBoxWidget = function OoUiComboBoxWidget( config ) {
// Configuration initialization
@@ -17,11 +18,15 @@
OO.ui.ComboBoxWidget.super.call( this, config );
// Properties
+ this.$overlay = config.$overlay || ( this.$.$iframe || this.$element
).closest( '.oo-ui-window' ).children( '.oo-ui-window-overlay' );
+ if ( this.$overlay.length === 0 ) {
+ this.$overlay = this.$( 'body' );
+ }
this.input = new OO.ui.TextInputWidget( $.extend(
{ $: this.$, indicator: 'down', disabled: this.isDisabled() },
config.input
) );
- this.menu = new OO.ui.MenuWidget( $.extend(
+ this.menu = new OO.ui.TextInputMenuWidget( this.input, $.extend(
{ $: this.$, widget: this, input: this.input, disabled:
this.isDisabled() },
config.menu
) );
@@ -39,10 +44,8 @@
} );
// Initialization
- this.$element.addClass( 'oo-ui-comboBoxWidget' ).append(
- this.input.$element,
- this.menu.$element
- );
+ this.$element.addClass( 'oo-ui-comboBoxWidget' ).append(
this.input.$element );
+ this.$overlay.append( this.menu.$element );
this.onMenuItemsChange();
};
--
To view, visit https://gerrit.wikimedia.org/r/163300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a39ae702e3fccf5bfb6d27299bd640ac2fa5c94
Gerrit-PatchSet: 9
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
