wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-11-27 17:20:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken ActionFieldLayout construction

Browse source 
OO.ui.ActionFieldLayout requires 3 parameters: 2 widgets and optional
configuration. But this code was passing only 1 widget. The config
object was actually used as a widget and never as config. It's a
miracle this was not throwing an error. ;-)

Replace with a more trivial FieldLayout which requires only 1 widget.

Also clean up some closely related code.

Change-Id: Idca9a39e9f442f3a5412027906de9f868fc12b76
This commit is contained in:
thiemowmde 2023-05-23 18:56:43 +02:00
parent 4c2cfdc45f
commit eb7fec0877
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/ext.templateDataGenerator.editTemplatePage/Dialog.js
View file

@ -231,22 +231,15 @@ Dialog.prototype.initialize = function () {
label: mw.msg( 'templatedata-modal-button-map' ),
classes: [ 'mw-templateData-maps-panel-button' ]
} );
var mapsActionFieldLayout = new OO.ui.ActionFieldLayout(
this.mapsPanelButton,
{
align: 'left',
label: mw.msg( 'templatedata-modal-button-map' )
}
);
this.paramListNoticeMessage = new OO.ui.MessageWidget();
this.paramListNoticeMessage.toggle( false );
this.paramSelect = new ParamSelectWidget();
var templateParamsFieldset = new OO.ui.FieldsetLayout( {
label: mw.msg( 'templatedata-modal-title-templateparams' )
} );
this.paramImport = new ParamImportWidget();
templateParamsFieldset.$element.append( this.paramSelect.$element, this.paramImport.$element );
var templateParamsFieldset = new OO.ui.FieldsetLayout( {
label: mw.msg( 'templatedata-modal-title-templateparams' ),
items: [ this.paramSelect, this.paramImport ]
} );
this.templateFormatSelectWidget = new OO.ui.ButtonSelectWidget();
this.templateFormatSelectWidget.addItems( [
@ -275,16 +268,15 @@ Dialog.prototype.initialize = function () {
} );
var templateFormatFieldSet = new OO.ui.FieldsetLayout( {
label: mw.msg( 'templatedata-modal-title-templateformat' )
} );
templateFormatFieldSet.addItems( [
new OO.ui.FieldLayout( this.templateFormatSelectWidget, {
} ),
label: mw.msg( 'templatedata-modal-title-templateformat' ),
items: [
new OO.ui.FieldLayout( this.templateFormatSelectWidget ),
new OO.ui.FieldLayout( this.templateFormatInputWidget, {
align: 'top',
label: mw.msg( 'templatedata-modal-title-templateformatstring' )
} )
] );
]
} );
// Param details panel
this.$paramDetailsContainer = $( '<div>' )
@ -296,7 +288,7 @@ Dialog.prototype.initialize = function () {
this.paramListNoticeMessage.$element,
languageActionFieldLayout.$element,
this.templateDescriptionFieldset.$element,
mapsActionFieldLayout.$element,
new OO.ui.FieldLayout( this.mapsPanelButton ).$element,
templateFormatFieldSet.$element,
templateParamsFieldset.$element
);