X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki%2Fmediawiki.ForeignStructuredUpload.BookletLayout.js;h=7d4ed537d7aaa9124cef25a055cde69a21780900;hb=f8b2c0222d7c3b62b22bc42f8dc5e9eda9a1db71;hp=7a1fa7f2997d8650aa4f2c558f10372586129390;hpb=10d1b7d12b5d097413cd507740c5c71781c2580b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 7a1fa7f299..7d4ed537d7 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -113,8 +113,7 @@
 					} )
 				);
 			}
-		).then(
-			null,
+		).catch(
 			// Always resolve, never reject
 			function () { return $.Deferred().resolve(); }
 		);
@@ -356,9 +355,9 @@
 	 */
 	mw.ForeignStructuredUpload.BookletLayout.prototype.saveFile = function () {
 		var title = mw.Title.newFromText(
-				this.getFilename(),
-				mw.config.get( 'wgNamespaceIds' ).file
-			);
+			this.getFilename(),
+			mw.config.get( 'wgNamespaceIds' ).file
+		);
 
 		return this.uploadPromise
 			.then( this.validateFilename.bind( this, title ) )
@@ -393,7 +392,8 @@
 		if ( file && file.type === 'image/jpeg' ) {
 			fileReader = new FileReader();
 			fileReader.onload = function () {
-				var fileStr, arr, i, metadata;
+				var fileStr, arr, i, metadata,
+					jpegmeta = mw.loader.require( 'mediawiki.libs.jpegmeta' );
 
 				if ( typeof fileReader.result === 'string' ) {
 					fileStr = fileReader.result;
@@ -407,7 +407,7 @@
 				}
 
 				try {
-					metadata = mw.libs.jpegmeta( fileStr, file.name );
+					metadata = jpegmeta( fileStr, file.name );
 				} catch ( e ) {
 					metadata = null;
 				}