From d199ce58566990c555d2c291974fcf5da5e7ec57 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 4 May 2018 03:54:20 +0100
Subject: [PATCH] jsjpegmeta: Move export patch to a separate file

Keep the main file in src/ for now, because it's got some whitespace
changes and a closure-wrap that make it differ from upstream's
version. Those changes are hard to review both for diffing and for
functional differences due to its odd-looking scope assignments that
I'd rather not change as part of this.

Change-Id: I248831cfa984432d0a30aa923a9bcd98029b05c4
---
 Gruntfile.js                                      |  2 +-
 resources/Resources.php                           |  5 ++++-
 resources/src/mediawiki.libs.jpegmeta/export.js   | 12 ++++++++++++
 .../jpegmeta.js}                                  | 15 ++-------------
 4 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 resources/src/mediawiki.libs.jpegmeta/export.js
 rename resources/src/{mediawiki.libs/mediawiki.libs.jpegmeta.js => mediawiki.libs.jpegmeta/jpegmeta.js} (98%)

diff --git a/Gruntfile.js b/Gruntfile.js
index 898b48f2df..2f5586862f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,7 +28,7 @@ module.exports = function ( grunt ) {
 				'!resources/lib/**',
 				'!resources/src/jquery.tipsy/**',
 				'!resources/src/jquery/jquery.farbtastic.js',
-				'!resources/src/mediawiki.libs/**',
+				'!resources/src/mediawiki.libs.jpegmeta/**',
 				// Third-party code of PHPUnit coverage report
 				'!tests/coverage/**',
 				'!vendor/**',
diff --git a/resources/Resources.php b/resources/Resources.php
index 91e5750b0a..160aeb39fc 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1670,7 +1670,10 @@ return [
 	/* MediaWiki Libs */
 
 	'mediawiki.libs.jpegmeta' => [
-		'scripts' => 'resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js',
+		'scripts' => [
+			'resources/src/mediawiki.libs.jpegmeta/jpegmeta.js',
+			'resources/src/mediawiki.libs.jpegmeta/export.js',
+		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 
diff --git a/resources/src/mediawiki.libs.jpegmeta/export.js b/resources/src/mediawiki.libs.jpegmeta/export.js
new file mode 100644
index 0000000000..e8913aae30
--- /dev/null
+++ b/resources/src/mediawiki.libs.jpegmeta/export.js
@@ -0,0 +1,12 @@
+/* global JpegMeta */
+( function ( mw ) {
+
+	// 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 );
+}( mediaWiki ) );
diff --git a/resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js b/resources/src/mediawiki.libs.jpegmeta/jpegmeta.js
similarity index 98%
rename from resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js
rename to resources/src/mediawiki.libs.jpegmeta/jpegmeta.js
index d837420c66..ed859142cc 100644
--- a/resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js
+++ b/resources/src/mediawiki.libs.jpegmeta/jpegmeta.js
@@ -7,11 +7,9 @@
  * Changes:
  * - Add closure.
  * - Add this.JpegMeta assignment to expose it as global.
- * - Add export as module.
- * - Add mw.libs.jpegmeta wrapper.
  */
 
-( function ( mw ) {
+( function () {
 	/*
 	Copyright (c) 2009 Ben Leslie
 	
@@ -730,13 +728,4 @@
 	    }
 	};
 
-	// 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 ) );
+}() );
-- 
2.20.1