X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki%2Fmediawiki.Upload.BookletLayout.js;h=c58af4f5b9dd78d3de362174dbad86b605c9df69;hp=172cac237919c1b9404969c76e1971933d54f03a;hb=0ef2a58569ac1c3602454db726addb88b4724cc8;hpb=1310fabe6e679fd6c8cabb06956cb8d614e5f2eb

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 172cac2379..c58af4f5b9 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -1,4 +1,4 @@
-/* global moment*/
+/* global moment */
 ( function ( $, mw, moment ) {
 
 	/**
@@ -230,7 +230,7 @@
 	 */
 	mw.Upload.BookletLayout.prototype.uploadFile = function () {
 		var deferred = $.Deferred(),
-			startTime = new Date(),
+			startTime = mw.now(),
 			layout = this,
 			file = this.getFile();
 
@@ -265,7 +265,7 @@
 				deferred.reject( errorMessage );
 			} );
 		}, function ( progress ) {
-			var elapsedTime = new Date() - startTime,
+			var elapsedTime = mw.now() - startTime,
 				estimatedTotalTime = ( 1 / progress ) * elapsedTime,
 				estimatedRemainingTime = moment.duration( estimatedTotalTime - elapsedTime );
 			layout.emit( 'fileUploadProgress', progress, estimatedRemainingTime );
@@ -330,13 +330,26 @@
 			stateDetails = this.upload.getStateDetails(),
 			error = stateDetails.errors ? stateDetails.errors[ 0 ] : false,
 			warnings = stateDetails.upload && stateDetails.upload.warnings,
-			$ul = $( '<ul>' );
+			$ul = $( '<ul>' ),
+			errorText;
 
 		if ( state === mw.Upload.State.ERROR ) {
 			if ( !error ) {
+				if ( stateDetails.textStatus === 'timeout' ) {
+					// in case of $.ajax.fail(), there is no response json
+					errorText = mw.message( 'apierror-timeout' ).parse();
+				} else if ( stateDetails.xhr && stateDetails.xhr.status === 0 ) {
+					// failed to even connect to server
+					errorText = mw.message( 'apierror-offline' ).parse();
+				} else if ( stateDetails.textStatus ) {
+					errorText = stateDetails.textStatus;
+				} else {
+					errorText = mw.message( 'apierror-unknownerror', JSON.stringify( stateDetails ) ).parse();
+				}
+
 				// If there's an 'exception' key, this might be a timeout, or other connection problem
 				return $.Deferred().resolve( new OO.ui.Error(
-					$( '<p>' ).msg( 'apierror-unknownerror', JSON.stringify( stateDetails ) ),
+					$( '<p>' ).html( errorText ),
 					{ recoverable: false }
 				) );
 			}