Use module.exports for mediawiki.libs.jpegmeta

Deprecate mw.libs.jpegmeta. Use
  mw.loader.require( 'mediawiki.libs.jpegmeta' )
instead.

Change-Id: I8a7fb7377248a2ce1cf9c6d3c888ca9835cadaad

diff --git a/resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js b/resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js
index 67460ad..d837420 100644 (file)
--- a/resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js
+++ b/resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js
@@ -7,6 +7,7 @@
  * Changes:
  * - Add closure.
  * - Add this.JpegMeta assignment to expose it as global.
+ * - Add export as module.
  * - Add mw.libs.jpegmeta wrapper.
  */
 
@@ -729,9 +730,13 @@
            }
        };
 
-       // MediaWiki: Add mw.libs wrapper
-       mw.libs.jpegmeta = function( fileReaderResult, fileName ) {
+       // MediaWiki: Export as module
+       module.exports = function( fileReaderResult, fileName ) {
                return new JpegMeta.JpegFile( fileReaderResult, fileName );
        };
 
+       // MediaWiki: Add mw.libs wrapper
+       // @deprecated since 1.31
+       mw.log.deprecate( mw.libs, 'jpegmeta', module.exports );
+
 }( mediaWiki ) );

diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js
index de5ab87..9120e2a 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@ -490,8 +490,9 @@
                                };
                                img.src = dataURL;
                        }, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
+                               var jpegmeta = mw.loader.require( 'mediawiki.libs.jpegmeta' );
                                try {
-                                       meta = mw.libs.jpegmeta( data, file.fileName );
+                                       meta = jpegmeta( data, file.fileName );
                                        // eslint-disable-next-line no-underscore-dangle, camelcase
                                        meta._binary_data = null;
                                } catch ( e ) {

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 2efacc9..7d4ed53 100644 (file)
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -392,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;
@@ -406,7 +407,7 @@
                                }
 
                                try {
-                                       metadata = mw.libs.jpegmeta( fileStr, file.name );
+                                       metadata = jpegmeta( fileStr, file.name );
                                } catch ( e ) {
                                        metadata = null;
                                }