wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Pass $overlay to FieldsetLayout and FieldLayout in various places"

Browse source
This commit is contained in:
jenkins-bot 2017-03-01 00:35:06 +00:00 committed by Gerrit Code Review
parent e163a09105 22df25c108
commit ec897c120b
5 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -244,6 +244,7 @@ ve.ui.MWMediaDialog.prototype.initialize = function () {
importRules: this.constructor.static.getImportRules() importRules: this.constructor.static.getImportRules()
} ); } );
this.captionFieldset = new OO.ui.FieldsetLayout( { this.captionFieldset = new OO.ui.FieldsetLayout( {
$overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-content-section' ), label: ve.msg( 'visualeditor-dialog-media-content-section' ),
help: ve.msg( 'visualeditor-dialog-media-content-section-help' ), help: ve.msg( 'visualeditor-dialog-media-content-section-help' ),
icon: 'parameter', icon: 'parameter',
@ -253,6 +254,7 @@ ve.ui.MWMediaDialog.prototype.initialize = function () {
// Alt text // Alt text
altTextFieldset = new OO.ui.FieldsetLayout( { altTextFieldset = new OO.ui.FieldsetLayout( {
$overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-alttext-section' ), label: ve.msg( 'visualeditor-dialog-media-alttext-section' ),
help: ve.msg( 'visualeditor-dialog-media-alttext-section-help' ), help: ve.msg( 'visualeditor-dialog-media-alttext-section-help' ),
icon: 'parameter' icon: 'parameter'
@ -273,12 +275,14 @@ ve.ui.MWMediaDialog.prototype.initialize = function () {
this.positionCheckbox = new OO.ui.CheckboxInputWidget(); this.positionCheckbox = new OO.ui.CheckboxInputWidget();
positionField = new OO.ui.FieldLayout( this.positionCheckbox, { positionField = new OO.ui.FieldLayout( this.positionCheckbox, {
$overlay: this.$overlay,
align: 'inline', align: 'inline',
label: ve.msg( 'visualeditor-dialog-media-position-checkbox' ), label: ve.msg( 'visualeditor-dialog-media-position-checkbox' ),
help: ve.msg( 'visualeditor-dialog-media-position-checkbox-help' ) help: ve.msg( 'visualeditor-dialog-media-position-checkbox-help' )
} ); } );
positionFieldset = new OO.ui.FieldsetLayout( { positionFieldset = new OO.ui.FieldsetLayout( {
$overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-position-section' ), label: ve.msg( 'visualeditor-dialog-media-position-section' ),
help: ve.msg( 'visualeditor-dialog-media-position-section-help' ), help: ve.msg( 'visualeditor-dialog-media-position-section-help' ),
icon: 'parameter' icon: 'parameter'
@ -292,6 +296,7 @@ ve.ui.MWMediaDialog.prototype.initialize = function () {
// Type // Type
this.typeFieldset = new OO.ui.FieldsetLayout( { this.typeFieldset = new OO.ui.FieldsetLayout( {
$overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-type-section' ), label: ve.msg( 'visualeditor-dialog-media-type-section' ),
help: ve.msg( 'visualeditor-dialog-media-type-section-help' ), help: ve.msg( 'visualeditor-dialog-media-type-section-help' ),
icon: 'parameter' icon: 'parameter'
@ -337,6 +342,7 @@ ve.ui.MWMediaDialog.prototype.initialize = function () {
// Size // Size
this.sizeFieldset = new OO.ui.FieldsetLayout( { this.sizeFieldset = new OO.ui.FieldsetLayout( {
$overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-size-section' ), label: ve.msg( 'visualeditor-dialog-media-size-section' ),
icon: 'parameter', icon: 'parameter',
help: ve.msg( 'visualeditor-dialog-media-size-section-help' ) help: ve.msg( 'visualeditor-dialog-media-size-section-help' )

7
modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
View file

@ -64,11 +64,8 @@ ve.ui.MWMetaDialog.prototype.initialize = function () {
this.panels = new OO.ui.StackLayout(); this.panels = new OO.ui.StackLayout();
this.bookletLayout = new OO.ui.BookletLayout( { outlined: true } ); this.bookletLayout = new OO.ui.BookletLayout( { outlined: true } );
this.categoriesPage = new ve.ui.MWCategoriesPage( 'categories', { $overlay: this.$overlay } ); this.categoriesPage = new ve.ui.MWCategoriesPage( 'categories', { $overlay: this.$overlay } );
this.settingsPage = new ve.ui.MWSettingsPage( this.settingsPage = new ve.ui.MWSettingsPage( 'settings', { $overlay: this.$overlay } );
'settings', this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage( 'advancedSettings', { $overlay: this.$overlay } );
{ $overlay: this.$overlay }
);
this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage( 'advancedSettings' );
this.languagesPage = new ve.ui.MWLanguagesPage( 'languages' ); this.languagesPage = new ve.ui.MWLanguagesPage( 'languages' );
this.templatesUsedPage = new ve.ui.MWTemplatesUsedPage( 'templatesUsed' ); this.templatesUsedPage = new ve.ui.MWTemplatesUsedPage( 'templatesUsed' );

7
modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
View file

@ -14,8 +14,9 @@
* @constructor * @constructor
* @param {string} name Unique symbolic name of page * @param {string} name Unique symbolic name of page
* @param {Object} [config] Configuration options * @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; var advancedSettingsPage = this;
// Parent constructor // Parent constructor
@ -52,6 +53,7 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage() {
] ) ] )
.connect( this, { select: 'onIndexingOptionChange' } ), .connect( this, { select: 'onIndexingOptionChange' } ),
{ {
$overlay: config.$overlay,
align: 'top', align: 'top',
label: ve.msg( 'visualeditor-dialog-meta-settings-index-label' ), label: ve.msg( 'visualeditor-dialog-meta-settings-index-label' ),
help: ve.msg( 'visualeditor-dialog-meta-settings-index-help' ) help: ve.msg( 'visualeditor-dialog-meta-settings-index-help' )
@ -77,6 +79,7 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage() {
] ) ] )
.connect( this, { select: 'onNewSectionEditLinkOptionChange' } ), .connect( this, { select: 'onNewSectionEditLinkOptionChange' } ),
{ {
$overlay: config.$overlay,
align: 'top', align: 'top',
label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-label' ), label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-label' ),
help: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-help', $( '#ca-edit' ).text() ) help: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-help', $( '#ca-edit' ).text() )
@ -89,6 +92,7 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage() {
this.displayTitleField = new OO.ui.FieldLayout( this.displayTitleField = new OO.ui.FieldLayout(
this.displayTitleInput, this.displayTitleInput,
{ {
$overlay: config.$overlay,
align: 'top', align: 'top',
label: ve.msg( 'visualeditor-dialog-meta-settings-displaytitle' ), label: ve.msg( 'visualeditor-dialog-meta-settings-displaytitle' ),
help: ve.msg( 'visualeditor-dialog-meta-settings-displaytitle-help' ) help: ve.msg( 'visualeditor-dialog-meta-settings-displaytitle-help' )
@ -117,6 +121,7 @@ ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage() {
this.fieldLayout = new OO.ui.FieldLayout( this.fieldLayout = new OO.ui.FieldLayout(
new OO.ui.CheckboxInputWidget(), new OO.ui.CheckboxInputWidget(),
{ {
$overlay: config.$overlay,
align: 'inline', align: 'inline',
label: this.label, label: this.label,
help: this.help help: this.help

1
modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
View file

@ -47,6 +47,7 @@ ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( name, config ) {
this.defaultSort = new OO.ui.FieldLayout( this.defaultSort = new OO.ui.FieldLayout(
this.defaultSortInput, this.defaultSortInput,
{ {
$overlay: config.$overlay,
align: 'top', align: 'top',
label: ve.msg( 'visualeditor-dialog-meta-categories-defaultsort-label' ), label: ve.msg( 'visualeditor-dialog-meta-categories-defaultsort-label' ),
help: ve.msg( 'visualeditor-dialog-meta-categories-defaultsort-help' ) help: ve.msg( 'visualeditor-dialog-meta-categories-defaultsort-help' )

4
modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
View file

@ -57,6 +57,7 @@ ve.ui.MWSettingsPage = function VeUiMWSettingsPage( name, config ) {
] ) ] )
.connect( this, { select: 'onTableOfContentsFieldChange' } ), .connect( this, { select: 'onTableOfContentsFieldChange' } ),
{ {
$overlay: config.$overlay,
align: 'top', align: 'top',
label: ve.msg( 'visualeditor-dialog-meta-settings-toc-label' ), label: ve.msg( 'visualeditor-dialog-meta-settings-toc-label' ),
help: ve.msg( 'visualeditor-dialog-meta-settings-toc-help' ) help: ve.msg( 'visualeditor-dialog-meta-settings-toc-help' )
@ -68,6 +69,7 @@ ve.ui.MWSettingsPage = function VeUiMWSettingsPage( name, config ) {
this.enableRedirectField = new OO.ui.FieldLayout( this.enableRedirectField = new OO.ui.FieldLayout(
this.enableRedirectInput, this.enableRedirectInput,
{ {
$overlay: config.$overlay,
classes: [ 've-test-page-settings-enable-redirect' ], classes: [ 've-test-page-settings-enable-redirect' ],
align: 'inline', align: 'inline',
label: ve.msg( 'visualeditor-dialog-meta-settings-redirect-label' ), label: ve.msg( 'visualeditor-dialog-meta-settings-redirect-label' ),
@ -86,6 +88,7 @@ ve.ui.MWSettingsPage = function VeUiMWSettingsPage( name, config ) {
this.enableStaticRedirectField = new OO.ui.FieldLayout( this.enableStaticRedirectField = new OO.ui.FieldLayout(
this.enableStaticRedirectInput, this.enableStaticRedirectInput,
{ {
$overlay: config.$overlay,
classes: [ 've-test-page-settings-prevent-redirect' ], classes: [ 've-test-page-settings-prevent-redirect' ],
align: 'inline', align: 'inline',
label: ve.msg( 'visualeditor-dialog-meta-settings-redirect-staticlabel' ), label: ve.msg( 'visualeditor-dialog-meta-settings-redirect-staticlabel' ),
@ -131,6 +134,7 @@ ve.ui.MWSettingsPage = function VeUiMWSettingsPage( name, config ) {
this.fieldLayout = new OO.ui.FieldLayout( this.fieldLayout = new OO.ui.FieldLayout(
new OO.ui.CheckboxInputWidget(), new OO.ui.CheckboxInputWidget(),
{ {
$overlay: config.$overlay,
classes: this.classes, classes: this.classes,
align: 'inline', align: 'inline',
label: this.label, label: this.label,