From dddb0064a9fe611add55877d8a8089a660af0811 Mon Sep 17 00:00:00 2001 From: Prateek Saxena Date: Thu, 1 Oct 2015 02:22:49 +0530 Subject: [PATCH] mw.Upload.BookletLayout: Go back to upload page on upload error Bug: T114130 Change-Id: Ibe50ce845a42bb5e66f842c68a35541747c9a570 --- .../src/mediawiki/mediawiki.Upload.BookletLayout.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js index fa2fb0b831..d75e1d3474 100644 --- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js @@ -183,11 +183,16 @@ this.setPage( 'info' ); this.upload.setFile( file ); + // Explicitly set the filename so that the old filename isn't used in case of retry + this.upload.setFilenameFromFile(); + this.uploadPromise = this.upload.uploadToStash(); this.uploadPromise.then( function () { deferred.resolve(); layout.emit( 'fileUploaded' ); } ); + + // These errors will be thrown while the user is on the info page this.uploadPromise.always( function () { if ( layout.upload.getState() === mw.Upload.State.ERROR ) { deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ) ) ); @@ -199,6 +204,11 @@ } } ); + // If there is an error in uploading, come back to the upload page + deferred.fail( function () { + layout.setPage( 'upload' ); + } ); + return deferred; }; -- 2.20.1