X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki%2Fmediawiki.Upload.BookletLayout.js;h=4038228cd7e87d899e56c2668eee43bf310dcf50;hb=3301e78e5a2e5662952c0564f830a492743f9844;hp=84b33fdc50bbff74792f93c4c933ec7e05aa58c6;hpb=3b26b9aca28bb379ee1c47946819f219514ff6d9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 84b33fdc50..4038228cd7 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -169,6 +169,9 @@
 			} ).always( function () {
 				deferred.resolve();
 			} );
+		} ).fail( function ( errorMsg ) {
+			booklet.getPage( 'upload' ).$element.msg( errorMsg );
+			deferred.resolve();
 		} );
 
 		return deferred.promise();
@@ -285,6 +288,14 @@
 			warnings = stateDetails.upload && stateDetails.upload.warnings;
 
 		if ( state === mw.Upload.State.ERROR ) {
+			if ( !error ) {
+				// If there's an 'exception' key, this might be a timeout, or other connection problem
+				return new OO.ui.Error(
+					$( '<p>' ).msg( 'api-error-unknownerror', JSON.stringify( stateDetails ) ),
+					{ recoverable: false }
+				);
+			}
+
 			// HACK We should either have a hook here to allow TitleBlacklist to handle this, or just have
 			// TitleBlacklist produce sane error messages that can be displayed without arcane knowledge
 			if ( error.info === 'TitleBlacklist prevents this title from being created' ) {