jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338041 )
Change subject: Pass $overlay to FieldsetLayout and FieldLayout in various
places
......................................................................
Pass $overlay to FieldsetLayout and FieldLayout in various places
We now use dialog's overlay in every case where we have a FieldsetLayout
or a FieldLayout with a help popup inside a dialog.
Bug: T100571
Change-Id: I8bd0ed430637feca63ec0f13cb7e1e1c659391a5
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
5 files changed, 19 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 00d460d..ce26902 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -244,6 +244,7 @@
importRules: this.constructor.static.getImportRules()
} );
this.captionFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-content-section' ),
help: ve.msg( 'visualeditor-dialog-media-content-section-help'
),
icon: 'parameter',
@@ -253,6 +254,7 @@
// Alt text
altTextFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-alttext-section' ),
help: ve.msg( 'visualeditor-dialog-media-alttext-section-help'
),
icon: 'parameter'
@@ -273,12 +275,14 @@
this.positionCheckbox = new OO.ui.CheckboxInputWidget();
positionField = new OO.ui.FieldLayout( this.positionCheckbox, {
+ $overlay: this.$overlay,
align: 'inline',
label: ve.msg( 'visualeditor-dialog-media-position-checkbox' ),
help: ve.msg(
'visualeditor-dialog-media-position-checkbox-help' )
} );
positionFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-position-section' ),
help: ve.msg( 'visualeditor-dialog-media-position-section-help'
),
icon: 'parameter'
@@ -292,6 +296,7 @@
// Type
this.typeFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-type-section' ),
help: ve.msg( 'visualeditor-dialog-media-type-section-help' ),
icon: 'parameter'
@@ -337,6 +342,7 @@
// Size
this.sizeFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-size-section' ),
icon: 'parameter',
help: ve.msg( 'visualeditor-dialog-media-size-section-help' )
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index fd204d4..a0520d2 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -64,11 +64,8 @@
this.panels = new OO.ui.StackLayout();
this.bookletLayout = new OO.ui.BookletLayout( { outlined: true } );
this.categoriesPage = new ve.ui.MWCategoriesPage( 'categories', {
$overlay: this.$overlay } );
- this.settingsPage = new ve.ui.MWSettingsPage(
- 'settings',
- { $overlay: this.$overlay }
- );
- this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage(
'advancedSettings' );
+ this.settingsPage = new ve.ui.MWSettingsPage( 'settings', { $overlay:
this.$overlay } );
+ this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage(
'advancedSettings', { $overlay: this.$overlay } );
this.languagesPage = new ve.ui.MWLanguagesPage( 'languages' );
this.templatesUsedPage = new ve.ui.MWTemplatesUsedPage( 'templatesUsed'
);
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index 0e13cd4..ef8aeac 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -14,8 +14,9 @@
* @constructor
* @param {string} name Unique symbolic name of page
* @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
*/
-ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage() {
+ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage( name,
config ) {
var advancedSettingsPage = this;
// Parent constructor
@@ -52,6 +53,7 @@
] )
.connect( this, { select: 'onIndexingOptionChange' } ),
{
+ $overlay: config.$overlay,
align: 'top',
label: ve.msg(
'visualeditor-dialog-meta-settings-index-label' ),
help: ve.msg(
'visualeditor-dialog-meta-settings-index-help' )
@@ -77,6 +79,7 @@
] )
.connect( this, { select:
'onNewSectionEditLinkOptionChange' } ),
{
+ $overlay: config.$overlay,
align: 'top',
label: ve.msg(
'visualeditor-dialog-meta-settings-newsectioneditlink-label' ),
help: ve.msg(
'visualeditor-dialog-meta-settings-newsectioneditlink-help', $( '#ca-edit'
).text() )
@@ -89,6 +92,7 @@
this.displayTitleField = new OO.ui.FieldLayout(
this.displayTitleInput,
{
+ $overlay: config.$overlay,
align: 'top',
label: ve.msg(
'visualeditor-dialog-meta-settings-displaytitle' ),
help: ve.msg(
'visualeditor-dialog-meta-settings-displaytitle-help' )
@@ -117,6 +121,7 @@
this.fieldLayout = new OO.ui.FieldLayout(
new OO.ui.CheckboxInputWidget(),
{
+ $overlay: config.$overlay,
align: 'inline',
label: this.label,
help: this.help
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index cb73bc3..198c9c8 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -47,6 +47,7 @@
this.defaultSort = new OO.ui.FieldLayout(
this.defaultSortInput,
{
+ $overlay: config.$overlay,
align: 'top',
label: ve.msg(
'visualeditor-dialog-meta-categories-defaultsort-label' ),
help: ve.msg(
'visualeditor-dialog-meta-categories-defaultsort-help' )
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
index 5a38a54..976c1fc 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
@@ -57,6 +57,7 @@
] )
.connect( this, { select:
'onTableOfContentsFieldChange' } ),
{
+ $overlay: config.$overlay,
align: 'top',
label: ve.msg(
'visualeditor-dialog-meta-settings-toc-label' ),
help: ve.msg(
'visualeditor-dialog-meta-settings-toc-help' )
@@ -68,6 +69,7 @@
this.enableRedirectField = new OO.ui.FieldLayout(
this.enableRedirectInput,
{
+ $overlay: config.$overlay,
classes: [ 've-test-page-settings-enable-redirect' ],
align: 'inline',
label: ve.msg(
'visualeditor-dialog-meta-settings-redirect-label' ),
@@ -86,6 +88,7 @@
this.enableStaticRedirectField = new OO.ui.FieldLayout(
this.enableStaticRedirectInput,
{
+ $overlay: config.$overlay,
classes: [ 've-test-page-settings-prevent-redirect' ],
align: 'inline',
label: ve.msg(
'visualeditor-dialog-meta-settings-redirect-staticlabel' ),
@@ -131,6 +134,7 @@
this.fieldLayout = new OO.ui.FieldLayout(
new OO.ui.CheckboxInputWidget(),
{
+ $overlay: config.$overlay,
classes: this.classes,
align: 'inline',
label: this.label,
--
To view, visit https://gerrit.wikimedia.org/r/338041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bd0ed430637feca63ec0f13cb7e1e1c659391a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
