From 03b667a2a71370ff28aedca65d80e8399d5a365b Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 9 Feb 2019 01:16:05 +0000 Subject: [PATCH] mediawiki.libs.jpegmeta: Remove deprecated mw.libs property Deprecated since 1.31. Also fix existing uses to not use the private mw.loader access pattern, which is unsupported and not needed here. Depends-On: If0a125320af15b92216d98f54348f8b375cc1988 Change-Id: I403379ebf710077b77a02854c22071014d1a6bc4 --- RELEASE-NOTES-1.33 | 2 ++ .../BookletLayout.js | 2 +- resources/src/mediawiki.libs.jpegmeta/export.js | 14 ++++---------- resources/src/mediawiki.special.upload/upload.js | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index b2de154347..8a02056d0c 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -233,6 +233,8 @@ because of Phabricator reports. of SessionManager, has been removed. * SessionManager::autoCreateUser, deprecated in 1.27, has been removed. Use MediaWiki\Auth\AuthManager::autoCreateUser instead. +* The mw.libs.jpegmeta property, deprecated in 1.31, was removed. + Use require( 'mediawiki.libs.jpegmeta' ) instead. === Deprecations in 1.33 === * The configuration option $wgUseESI has been deprecated, and is expected diff --git a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js index 9974e2bd3b..24806b5b25 100644 --- a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js +++ b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js @@ -394,7 +394,7 @@ fileReader = new FileReader(); fileReader.onload = function () { var fileStr, arr, i, metadata, - jpegmeta = mw.loader.require( 'mediawiki.libs.jpegmeta' ); + jpegmeta = require( 'mediawiki.libs.jpegmeta' ); if ( typeof fileReader.result === 'string' ) { fileStr = fileReader.result; diff --git a/resources/src/mediawiki.libs.jpegmeta/export.js b/resources/src/mediawiki.libs.jpegmeta/export.js index a28bd8f14c..849e8f2b81 100644 --- a/resources/src/mediawiki.libs.jpegmeta/export.js +++ b/resources/src/mediawiki.libs.jpegmeta/export.js @@ -1,12 +1,6 @@ /* global JpegMeta */ -( function () { - // Export as module - module.exports = function ( fileReaderResult, fileName ) { - return new JpegMeta.JpegFile( fileReaderResult, fileName ); - }; - - // Back-compat: Also expose via mw.lib - // @deprecated since 1.31 - mw.log.deprecate( mw.libs, 'jpegmeta', module.exports ); -}() ); +// Export as module +module.exports = function ( fileReaderResult, fileName ) { + return new JpegMeta.JpegFile( fileReaderResult, fileName ); +}; diff --git a/resources/src/mediawiki.special.upload/upload.js b/resources/src/mediawiki.special.upload/upload.js index 8abb8f2569..77ca84800c 100644 --- a/resources/src/mediawiki.special.upload/upload.js +++ b/resources/src/mediawiki.special.upload/upload.js @@ -490,7 +490,7 @@ }; img.src = dataURL; }, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) { - var jpegmeta = mw.loader.require( 'mediawiki.libs.jpegmeta' ); + var jpegmeta = require( 'mediawiki.libs.jpegmeta' ); try { meta = jpegmeta( data, file.fileName ); // eslint-disable-next-line no-underscore-dangle, camelcase -- 2.20.1