[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Only resolve wikitext promise when progress dialog has closed

[Esanders (Code Review)]

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397862 )

Change subject: Only resolve wikitext promise when progress dialog has closed
......................................................................

Only resolve wikitext promise when progress dialog has closed

Logically depends on I0cdb004011 to fix the bug.

Bug: T182402
Change-Id: I8ecd695c052a6c759b8261e81fb25c771bdf3d56
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/62/397862/1

diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index f102637..898eb81 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -128,7 +128,7 @@
  * @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 @@
        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();
+       } );
 };
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/397862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ecd695c052a6c759b8261e81fb25c771bdf3d56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits