wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-12-02 19:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move around parameter renaming logic to update paramOrder

Browse source 
Also make getNewValidParameterKey actually return (probably not necessary for
this commit but I discovered it in the process).

Bug: T138800
Change-Id: I94ec6729b98c126b609b747fe4ce04a5fc02f616
This commit is contained in:
Alex Monk 2016-06-28 15:42:20 +01:00 committed by James D. Forrester
parent 746c743a32
commit 5fe2360d99
1 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
modules/ext.templateDataGenerator.data.js
View file

@ -672,7 +672,8 @@ mw.TemplateData.Model.prototype.getTemplateFormat = function () {
mw.TemplateData.Model.prototype.setParamProperty = function ( paramKey, prop, value, language ) { mw.TemplateData.Model.prototype.setParamProperty = function ( paramKey, prop, value, language ) {
var propertiesWithLanguage = this.constructor.static.getPropertiesWithLanguage(), var propertiesWithLanguage = this.constructor.static.getPropertiesWithLanguage(),
allProps = this.constructor.static.getAllProperties( true ), allProps = this.constructor.static.getAllProperties( true ),
status = false; status = false,
oldValue;
language = language || this.getDefaultLanguage(); language = language || this.getDefaultLanguage();
if ( !allProps[ prop ] ) { if ( !allProps[ prop ] ) {
@ -702,9 +703,34 @@ mw.TemplateData.Model.prototype.setParamProperty = function ( paramKey, prop, va
} else { } else {
// Compare without language // Compare without language
if ( !this.constructor.static.compare( this.params[ paramKey ][ prop ], value ) ) { if ( !this.constructor.static.compare( this.params[ paramKey ][ prop ], value ) ) {
oldValue = this.params[ paramKey ][ prop ];
if ( prop === 'name' ) {
// See if the parameters already has something with this new key
if ( this.params[ value ] ) {
// Change the key to be something else
value += this.getNewValidParameterKey( value );
}
// Copy param details to new name
this.params[ value ] = this.params[ oldValue ];
// Delete the old param
this.params[ oldValue ] = { deleted: true };
this.params[ value ][ prop ] = value;
} else {
this.params[ paramKey ][ prop ] = value; this.params[ paramKey ][ prop ] = value;
}
this.emit( 'change-property', paramKey, prop, value, language ); this.emit( 'change-property', paramKey, prop, value, language );
this.emit( 'change' ); this.emit( 'change' );
if ( prop === 'name' ) {
this.paramOrder[ this.paramOrder.indexOf( oldValue ) ] = value;
this.paramOrderChanged = true;
this.emit( 'change-paramOrder', this.paramOrder );
this.emit( 'change' );
}
status = true; status = true;
} }
} }
@ -868,7 +894,7 @@ mw.TemplateData.Model.prototype.getOriginalTemplateDataObject = function () {
* @return {Object} Templatedata object * @return {Object} Templatedata object
*/ */
mw.TemplateData.Model.prototype.outputTemplateData = function () { mw.TemplateData.Model.prototype.outputTemplateData = function () {
var param, paramKey, key, prop, oldKey, name, compareOrig, normalizedValue, var paramKey, key, prop, oldKey, name, compareOrig, normalizedValue,
allProps = this.constructor.static.getAllProperties( true ), allProps = this.constructor.static.getAllProperties( true ),
original = this.getOriginalTemplateDataObject(), original = this.getOriginalTemplateDataObject(),
result = $.extend( true, {}, this.getOriginalTemplateDataObject() ), result = $.extend( true, {}, this.getOriginalTemplateDataObject() ),
@ -925,21 +951,6 @@ mw.TemplateData.Model.prototype.outputTemplateData = function () {
// Check if name was changed and change the key accordingly // Check if name was changed and change the key accordingly
name = this.params[ key ].name; name = this.params[ key ].name;
oldKey = key; oldKey = key;
if ( key !== this.params[ key ].name ) {
key = this.params[ key ].name;
// See if the parameters already has something with this new key
if ( this.params[ key ] ) {
// Change the key to be something else
key += this.getNewValidParameterKey( key );
}
// Copy param details to new name in the model
this.params[ key ] = this.params[ oldKey ];
// Update the references to the key and param data
param = result.params[ name ];
// Delete the old param in both the result and model param
delete result.params[ oldKey ];
delete this.params[ oldKey ];
}
// Notice for clarity: // Notice for clarity:
// Whether the parameter name was changed or not the following // Whether the parameter name was changed or not the following
@ -1046,7 +1057,7 @@ mw.TemplateData.Model.prototype.getNewValidParameterKey = function ( key ) {
// Change the key to be something else // Change the key to be something else
key += this.paramIdentifierCounter; key += this.paramIdentifierCounter;
this.paramIdentifierCounter++; this.paramIdentifierCounter++;
this.getNewValidParameterKey( key ); return this.getNewValidParameterKey( key );
} else { } else {
return key; return key;
} }