From 048b0c2b7a49820fb3785f8b84a61ddb69b5631c Mon Sep 17 00:00:00 2001 From: Prateek Saxena Date: Thu, 1 Oct 2015 02:01:52 +0530 Subject: [PATCH] mw.Upload.BookletLayout: Make all errors unrecoverable Any error apart from 503's can't be recovered just by hitting 'Try Again'. The user will _have_ to make some changes before the process can continue. Bug: T114130 Change-Id: I8e2d619be5b7e47bc903155c353bc1da36a62bb6 --- .../mediawiki/mediawiki.Upload.BookletLayout.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js index fa2fb0b831..df28611e8a 100644 --- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js @@ -190,11 +190,15 @@ } ); 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 ) { - 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; } } ); @@ -225,12 +229,16 @@ var name; 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 ) { - deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-warning' ) ) ); + deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-warning' ), { + recoverable: false + } ) ); return false; } -- 2.20.1