wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ve.ui.MWTemplateDialog: Use normal #getReadyProcess instead of custom stuff"

Browse source
This commit is contained in:
jenkins-bot 2017-06-01 18:08:21 +00:00 committed by Gerrit Code Review
parent a506627f57 834539748c
commit f01577ffa8
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,16 +75,18 @@ ve.ui.MWTemplateDialog.static.bookletLayoutConfig = {
/* Methods */
/**
* Handle the transclusion being ready to use.
* @inheritdoc
*/
ve.ui.MWTemplateDialog.prototype.onTransclusionReady = function () {
// Add missing required and suggested parameters to each transclusion.
this.transclusionModel.addPromptedParameters();
this.loaded = true;
this.$element.addClass( 've-ui-mwTemplateDialog-ready' );
this.$body.append( this.bookletLayout.$element );
this.popPending();
this.bookletLayout.focus( 1 );
ve.ui.MWTemplateDialog.prototype.getReadyProcess = function ( data ) {
return ve.ui.MWTemplateDialog.super.prototype.getReadyProcess.call( this, data )
.next( function () {
// Add missing required and suggested parameters to each transclusion.
this.transclusionModel.addPromptedParameters();
this.loaded = true;
this.$element.addClass( 've-ui-mwTemplateDialog-ready' );
this.$body.append( this.bookletLayout.$element );
this.bookletLayout.focus( 1 );
}, this );
};
/**
@ -354,7 +356,7 @@ ve.ui.MWTemplateDialog.prototype.initialize = function () {
// Initialization
this.$content.addClass( 've-ui-mwTemplateDialog' );
// bookletLayout is appended after the form has been built in onTransclusionReady for performance
// bookletLayout is appended after the form has been built in getReadyProcess for performance
};
/**
@ -475,7 +477,7 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
template = ve.dm.MWTemplateModel.newFromName(
this.transclusionModel, data.template
);
promise = this.transclusionModel.addPart( template ).done(
promise = this.transclusionModel.addPart( template ).then(
this.initializeNewTemplateParameters.bind( this )
);
} else {
@ -489,11 +491,10 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
// Load existing template
promise = this.transclusionModel
.load( ve.copy( this.selectedNode.getAttribute( 'mw' ) ) )
.done( this.initializeTemplateParameters.bind( this ) );
.then( this.initializeTemplateParameters.bind( this ) );
}
this.actions.setAbilities( { apply: false, insert: false } );
this.pushPending();
promise.always( this.onTransclusionReady.bind( this ) );
return promise;
}, this );
};

10
modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
View file

@ -63,11 +63,11 @@ ve.ui.MWTransclusionDialog.static.bookletLayoutConfig = ve.extendObject(
/**
* @inheritdoc
*/
ve.ui.MWTransclusionDialog.prototype.onTransclusionReady = function () {
// Parent method
ve.ui.MWTransclusionDialog.super.prototype.onTransclusionReady.call( this );
this.setMode( 'auto' );
ve.ui.MWTransclusionDialog.prototype.getReadyProcess = function ( data ) {
return ve.ui.MWTransclusionDialog.super.prototype.getReadyProcess.call( this, data )
.next( function () {
this.setMode( 'auto' );
}, this );
};
/**