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

Merge "Allow adding a new parameter again"

Browse source
This commit is contained in:
jenkins-bot 2015-02-19 02:10:11 +00:00 committed by Gerrit Code Review
parent d59d517339 c525aef5b0
commit ca94adc3a9
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -823,7 +823,7 @@ mw.TemplateData.Model.prototype.getParams = function () {
}; };
mw.TemplateData.Model.prototype.isParamDeleted = function ( key ) { mw.TemplateData.Model.prototype.isParamDeleted = function ( key ) {
return this.params[key].deleted === true; return this.params[key] && this.params[key].deleted === true;
}; };
mw.TemplateData.Model.prototype.isParamExists = function ( key ) { mw.TemplateData.Model.prototype.isParamExists = function ( key ) {

17
modules/ext.templateDataGenerator.ui.tdDialog.js
View file

@ -224,7 +224,15 @@ mw.TemplateData.Dialog.prototype.onModelChangeDescription = function ( descripti
}; };
mw.TemplateData.Dialog.prototype.onAddParamInputChange = function ( value ) { mw.TemplateData.Dialog.prototype.onAddParamInputChange = function ( value ) {
if ( this.model.isParamExists( value ) && !this.model.isParamDeleted( value ) ) { var allProps = mw.TemplateData.Model.static.getAllProperties( true );
if (
value.match( allProps.name.restrict ) ||
(
this.model.isParamExists( value ) &&
!this.model.isParamDeleted( value )
)
) {
// Disable the add button // Disable the add button
this.addParamButton.setDisabled( true ); this.addParamButton.setDisabled( true );
} else { } else {
@ -355,14 +363,11 @@ mw.TemplateData.Dialog.prototype.onAddParamButtonClick = function () {
allProps = mw.TemplateData.Model.static.getAllProperties( true ); allProps = mw.TemplateData.Model.static.getAllProperties( true );
// Validate parameter // Validate parameter
if ( if ( !newParamKey.match( allProps.name.restrict ) ) {
!newParamKey.match( allProps.name.restrict ) &&
this.model.isParamExists( newParamKey )
) {
if ( this.model.isParamDeleted( newParamKey ) ) { if ( this.model.isParamDeleted( newParamKey ) ) {
// Empty param // Empty param
this.model.emptyParamData( newParamKey ); this.model.emptyParamData( newParamKey );
} else { } else if ( !this.model.isParamExists( newParamKey ) ) {
// Add to model // Add to model
if ( this.model.addParam( newParamKey ) ) { if ( this.model.addParam( newParamKey ) ) {
// Add parameter to list // Add parameter to list