Use module.exports for mediawiki.libs.jpegmeta

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.ForeignStructuredUpload.BookletLayout.js

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 7a1fa7f..7d4ed53 100644 (file)
--- 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;
                                }