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 "Only resolve wikitext promise when progress dialog has closed"

Browse source
This commit is contained in:
jenkins-bot 2018-04-17 16:52:26 +00:00 committed by Gerrit Code Review
parent 9ea5a94ac9 b38500f102
commit afd08dbc4d
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
View file

@ -128,7 +128,7 @@ ve.dm.MWWikitextSurfaceFragment.prototype.unwrapText = function ( before, after
* @inheritdoc
*/
ve.dm.MWWikitextSurfaceFragment.prototype.convertToSource = function ( doc ) {
var wikitextPromise;
var wikitextPromise, progressPromise;
if ( !doc.data.hasContent() ) {
return $.Deferred().resolve( '' ).promise();
@ -137,15 +137,21 @@ ve.dm.MWWikitextSurfaceFragment.prototype.convertToSource = function ( doc ) {
wikitextPromise = ve.init.target.getWikitextFragment( doc, false );
// TODO: Emit an event to trigger the progress bar
ve.init.target.getSurface().createProgress(
progressPromise = ve.init.target.getSurface().createProgress(
wikitextPromise, ve.msg( 'visualeditor-generating-wikitext-progress' )
).done( function ( progressBar, cancelPromise ) {
).then( function ( progressBar, cancelPromise ) {
cancelPromise.fail( function () {
wikitextPromise.abort();
} );
} );
return wikitextPromise;
return $.when( wikitextPromise, progressPromise ).then( function ( wikitext ) {
var deferred = $.Deferred();
setTimeout( function () {
deferred.resolve( wikitext );
}, ve.init.target.getSurface().dialogs.getTeardownDelay() );
return deferred.promise();
} );
};
/**