jenkins-bot has submitted this change and it was merged. Change subject: Move autoValue logic from ui.MWParameterPage to dm.MWParameterModel ......................................................................
Move autoValue logic from ui.MWParameterPage to dm.MWParameterModel Also add missing MWParameterModel#getDefaultValue Bug: 72404 Change-Id: I4bb117d419f3845f44e321f848e95bb246a24e24 --- M modules/ve-mw/dm/models/ve.dm.MWParameterModel.js M modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js 2 files changed, 22 insertions(+), 7 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/dm/models/ve.dm.MWParameterModel.js b/modules/ve-mw/dm/models/ve.dm.MWParameterModel.js index 270a0ee..00aeb0e 100644 --- a/modules/ve-mw/dm/models/ve.dm.MWParameterModel.js +++ b/modules/ve-mw/dm/models/ve.dm.MWParameterModel.js @@ -110,10 +110,29 @@ /** * Get parameter value. * - * @returns {string} Parameter value + * @returns {string} Parameter value, or automatic value if there is none stored. + * Otherwise an empty string. */ ve.dm.MWParameterModel.prototype.getValue = function () { - return this.value; + return this.value || this.getAutoValue() || ''; +}; + +/** + * Get default parameter value. + * + * @returns {string} Default parameter value + */ +ve.dm.MWParameterModel.prototype.getDefaultValue = function () { + return this.template.getSpec().getParameterDefaultValue( this.name ); +}; + +/** + * Get automatic parameter value. + * + * @returns {string} Automatic parameter name. + */ +ve.dm.MWParameterModel.prototype.getAutoValue = function () { + return this.template.getSpec().getParameterAutoValue( this.name ); }; /** diff --git a/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js b/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js index 8aa5ae6..9b1ad5d 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js @@ -30,11 +30,7 @@ // Properties this.parameter = parameter; this.spec = parameter.getTemplate().getSpec(); - this.defaultValue = this.spec.getParameterDefaultValue( paramName ); - this.autoValue = this.spec.getParameterAutoValue( paramName ); - if ( this.autoValue && !this.parameter.getValue() ) { - this.parameter.setValue( this.autoValue ); - } + this.defaultValue = parameter.getDefaultValue(); this.$info = this.$( '<div>' ); this.$actions = this.$( '<div>' ); -- To view, visit https://gerrit.wikimedia.org/r/168926 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4bb117d419f3845f44e321f848e95bb246a24e24 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Alex Monk <kren...@wikimedia.org> Gerrit-Reviewer: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits