wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Template dialog: Disable 'Apply changes' until a change is made"

Browse source
This commit is contained in:
jenkins-bot 2015-02-10 23:17:01 +00:00 committed by Gerrit Code Review
parent 01d64773ae dc69b15db1
commit 7ac177c02e
2 changed files with 48 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
View file

@ -135,7 +135,7 @@
* @fires change
*/
ve.dm.MWTransclusionModel.prototype.process = function ( queue ) {
var i, len, item, title, index, remove, existing;
var i, len, item, title, index, remove, existing, resolveQueue = [];
for ( i = 0, len = queue.length; i < len; i++ ) {
remove = 0;
@ -181,10 +181,17 @@
// Resolve promises
if ( item.deferred ) {
item.deferred.resolve();
resolveQueue.push( item.deferred );
}
}
this.emit( 'change' );
// We need to go back and resolve the deferreds after emitting change.
// Otherwise we get silly situations like a single change event being
// guaranteed after the transclusion loaded promise gets resolved.
for ( i = 0; i < resolveQueue.length; i++ ) {
resolveQueue[i].resolve();
}
};
/** */

46
modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
View file

@ -24,6 +24,7 @@ ve.ui.MWTemplateDialog = function VeUiMWTemplateDialog( config ) {
// Properties
this.transclusionModel = null;
this.loaded = false;
this.altered = false;
this.preventReselection = false;
this.confirmOverlay = new ve.ui.Overlay( { classes: ['ve-ui-overlay-global'] } );
@ -85,6 +86,16 @@ ve.ui.MWTemplateDialog.prototype.onTransclusionReady = function () {
this.popPending();
};
/**
* Called when the transclusion model changes. E.g. parts changes, parameter values changes.
*/
ve.ui.MWTemplateDialog.prototype.onTransclusionModelChange = function () {
if ( this.loaded ) {
this.altered = true;
this.setApplicableStatus();
}
};
/**
* Handle parts being replaced.
*
@ -155,6 +166,10 @@ ve.ui.MWTemplateDialog.prototype.onReplacePart = function ( removed, added ) {
this.setPageByName( reselect.getName() );
}
if ( this.loaded && ( added || removed ) ) {
this.altered = true;
}
this.setApplicableStatus();
this.updateTitle();
@ -174,8 +189,13 @@ ve.ui.MWTemplateDialog.prototype.onAddParameter = function ( param ) {
page = new ve.ui.MWParameterPlaceholderPage( param, param.getId(), { $: this.$ } );
}
this.bookletLayout.addPages( [ page ], this.transclusionModel.getIndex( param ) );
if ( this.loaded && !this.preventReselection ) {
this.setPageByName( param.getId() );
if ( this.loaded ) {
if ( !this.preventReselection ) {
this.setPageByName( param.getId() );
}
this.altered = true;
this.setApplicableStatus();
} else {
this.onAddParameterBeforeLoad( page );
}
@ -214,8 +234,13 @@ ve.ui.MWTemplateDialog.prototype.onRemoveParameter = function ( param ) {
reselect = this.bookletLayout.getClosestPage( page );
this.bookletLayout.removePages( [ page ] );
if ( this.loaded && !this.preventReselection ) {
this.setPageByName( reselect.getName() );
if ( this.loaded ) {
if ( !this.preventReselection ) {
this.setPageByName( reselect.getName() );
}
this.altered = true;
this.setApplicableStatus();
}
};
@ -229,11 +254,14 @@ ve.ui.MWTemplateDialog.prototype.setApplicableStatus = function () {
var parts = this.transclusionModel && this.transclusionModel.getParts();
if ( this.loading.state() !== 'resolved' ) {
// Loading is not resolved
this.actions.setAbilities( { apply: false, insert: false } );
} else if ( parts.length && !( parts[0] instanceof ve.dm.MWTemplatePlaceholderModel ) ) {
this.actions.setAbilities( { apply: true, insert: true } );
// Loading is resolved, and we have parts, and first one is not placeholder
this.actions.setAbilities( { apply: this.altered, insert: true } );
} else {
this.actions.setAbilities( { apply: parts.length === 0, insert: false } );
// Loading is resolved. We have either: 1) no parts, or 2) the a placeholder as the first part
this.actions.setAbilities( { apply: parts.length === 0 && this.altered, insert: false } );
}
};
@ -433,10 +461,14 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
// Properties
this.loaded = false;
this.altered = false;
this.transclusionModel = new ve.dm.MWTransclusionModel();
// Events
this.transclusionModel.connect( this, { replace: 'onReplacePart' } );
this.transclusionModel.connect( this, {
replace: 'onReplacePart',
change: 'onTransclusionModelChange'
} );
// Initialization
if ( !this.selectedNode ) {