jenkins-bot has submitted this change and it was merged.
Change subject: Pass $overlay to widgets that need it
......................................................................
Pass $overlay to widgets that need it
Also change this.$overlay (which doesn't even exist) to
config.$overlay in MWTemplatePlaceholderPage and document it.
Compensates for I39df86373ea in oojs-ui.
Change-Id: I4a233c058439d6cfb38d80ece890c8fe57d58f49
---
M modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
3 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
index 0627e36..d98c59a 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
@@ -83,6 +83,7 @@
this.groupInput = new ve.ui.MWReferenceGroupInputWidget( {
$: this.$,
+ $overlay: this.$overlay,
emptyGroupName: ve.msg(
'visualeditor-dialog-reference-options-group-placeholder' )
} );
this.groupField = new OO.ui.FieldLayout( this.groupInput, {
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index 4797914..a7e52f3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -254,7 +254,11 @@
if ( part instanceof ve.dm.MWTemplateModel ) {
return new ve.ui.MWTemplatePage( part, part.getId(), { $:
this.$ } );
} else if ( part instanceof ve.dm.MWTemplatePlaceholderModel ) {
- return new ve.ui.MWTemplatePlaceholderPage( part, part.getId(),
{ $: this.$ } );
+ return new ve.ui.MWTemplatePlaceholderPage(
+ part,
+ part.getId(),
+ { $: this.$, $overlay: this.$overlay }
+ );
}
return null;
};
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index 997bbf2..d888ef3 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -15,6 +15,7 @@
* @param {ve.dm.MWTemplatePlaceholderModel} placeholder Template placeholder
* @param {string} name Unique symbolic name of page
* @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay for dropdowns
*/
ve.ui.MWTemplatePlaceholderPage = function VeUiMWTemplatePlaceholderPage(
placeholder, name, config ) {
// Configuration initialization
@@ -29,7 +30,7 @@
this.placeholder = placeholder;
this.addTemplateInput = new ve.ui.MWTitleInputWidget( {
- $: this.$, $overlay: this.$overlay, namespace: 10
+ $: this.$, $overlay: config.$overlay, namespace: 10
} )
.connect( this, {
change: 'onTemplateInputChange',
--
To view, visit https://gerrit.wikimedia.org/r/169281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a233c058439d6cfb38d80ece890c8fe57d58f49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
