From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 30 Sep 2015 21:09:07 +0000 (+0000)
Subject: Merge "mw.Upload.BookletLayout: Go back to upload page on upload error"
X-Git-Tag: 1.31.0-rc.0~9628
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=dc2bcf6e3853d356dc25c2bdfc6d66ff8b91e2b9;p=lhc%2Fweb%2Fwiklou.git

Merge "mw.Upload.BookletLayout: Go back to upload page on upload error"
---

dc2bcf6e3853d356dc25c2bdfc6d66ff8b91e2b9
diff --cc resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index df28611e8a,d75e1d3474..42312dd6c8
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@@ -188,11 -191,11 +191,13 @@@
  			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' )  ) );
 +				deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ), {
 +					recoverable: false
 +				} ) );
  				return false;
  			}
  			if ( layout.upload.getState() === mw.Upload.State.WARNING ) {