Sophivorus has submitted this change and it was merged.
Change subject: Fix parameter order bug
......................................................................
Fix parameter order bug
Bug: T149176
Change-Id: Ice49aad3ee1b05e7a53d80f43d93f1a47a1bd39e
---
M proveit.js
1 file changed, 17 insertions(+), 19 deletions(-)
Approvals:
Sophivorus: Verified; Looks good to me, approved
diff --git a/proveit.js b/proveit.js
index 5e51af8..5484e80 100755
--- a/proveit.js
+++ b/proveit.js
@@ -724,19 +724,17 @@
};
/**
- * Get the registered parameters for this reference
+ * Get the parameter order from the template data
*
- * @return {object} TemplateData of the registered parameters
+ * @return {array}
*/
- this.getRegisteredParams = function () {
- var registeredParams = {};
+ this.getParamOrder = function () {
+ var paramOrder = [];
if ( this.template ) {
var templateData = this.getTemplateData();
- templateData.paramOrder.forEach( function (
paramName ) {
- registeredParams[ paramName ] =
templateData.params[ paramName ];
- });
+ paramOrder = templateData.paramOrder;
}
- return registeredParams;
+ return paramOrder;
};
/**
@@ -751,10 +749,10 @@
if ( 'main' in templateMap && templateMap.main
in this.params ) {
mainValue = this.params[
templateMap.main ];
} else {
- var registeredParams =
this.getRegisteredParams();
- for ( var param in registeredParams ) {
- if ( param in this.params ) {
- mainValue =
this.params[ param ];
+ var templateData =
this.getTemplateData();
+ for ( var paramName in
templateData.params ) {
+ if ( paramName in this.params )
{
+ mainValue =
this.params[ paramName ];
}
}
}
@@ -884,12 +882,12 @@
// Add the parameter fields
var templateData = this.getTemplateData(),
templateMap = this.getTemplateMap(),
- registeredParams = this.getRegisteredParams(),
- paramData, paramLabel, paramPlaceholder,
paramDescription, paramAlias, paramValue, row, label, paramNameInput,
paramValueInput;
+ paramOrder = this.getParamOrder(),
+ paramName, paramData, paramLabel,
paramPlaceholder, paramDescription, paramAlias, paramValue, row, label,
paramNameInput, paramValueInput;
- for ( var paramName in registeredParams ) {
-
- paramData = registeredParams[ paramName ];
+ for ( var i = 0; i < paramOrder.length; i++ ) {
+ paramName = paramOrder[ i ];
+ paramData = templateData.params[ paramName ];
// Defaults
paramLabel = paramName;
@@ -920,8 +918,8 @@
if ( paramName in this.params ) {
paramValue = this.params[ paramName ];
} else {
- for ( var i = 0; i <
paramData.aliases.length; i++ ) {
- paramAlias = paramData.aliases[
i ];
+ for ( var j = 0; j <
paramData.aliases.length; j++ ) {
+ paramAlias = paramData.aliases[
j ];
paramAlias = $.trim( paramAlias
);
if ( paramAlias in this.params
) {
paramValue =
this.params[ paramAlias ];
--
To view, visit https://gerrit.wikimedia.org/r/318105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice49aad3ee1b05e7a53d80f43d93f1a47a1bd39e
Gerrit-PatchSet: 2
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus <scheno...@gmail.com>
Gerrit-Reviewer: Sophivorus <scheno...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
