jenkins-bot has submitted this change and it was merged. Change subject: Reset paramOrder widget on dialog setup ......................................................................
Reset paramOrder widget on dialog setup Make sure that every time the dialog is open, the paramOrder widget is emptied so it can be refilled fresh from the model. Bug: T88126 Change-Id: I628c66710cb1f2f77385b16c627585350f357c45 --- M modules/ext.templateDataGenerator.ui.tdDialog.js 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js b/modules/ext.templateDataGenerator.ui.tdDialog.js index 5eb32b2..11d1b1b 100644 --- a/modules/ext.templateDataGenerator.ui.tdDialog.js +++ b/modules/ext.templateDataGenerator.ui.tdDialog.js @@ -258,6 +258,7 @@ data: key, label: key } ); + this.paramOrderWidget.addItems( [ dragItem ] ); }; @@ -437,6 +438,10 @@ if ( this.languageDropdownWidget ) { this.languageDropdownWidget.getMenu().clearItems(); + } + + if ( this.paramOrderWidget ) { + this.paramOrderWidget.clearItems(); } }; @@ -708,12 +713,12 @@ TemplateDataDialog.prototype.getSetupProcess = function ( data ) { return TemplateDataDialog.super.prototype.getSetupProcess.call( this, data ) .next( function () { + this.reset(); // Hide the panels and display a spinner this.$spinner.show(); this.panels.$element.hide(); this.toggleNoticeMessage( 'global', false ); this.toggleNoticeMessage( 'list', false ); - this.reset(); // Start with parameter list this.switchPanels( 'listParams' ); @@ -783,13 +788,9 @@ * after initialization of the model. */ TemplateDataDialog.prototype.setupDetailsFromModel = function () { - // Reset parameter list - this.reset(); - // Set up description this.descriptionInput.setValue( this.model.getTemplateDescription( this.language ) ); - // TODO: Set up paramOrder - + // Repopulate the parameter list this.repopulateParamSelectWidget(); }; -- To view, visit https://gerrit.wikimedia.org/r/187322 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I628c66710cb1f2f77385b16c627585350f357c45 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Mooeypoo <mor...@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