From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 25 May 2011 15:19:16 +0000 (+0000)
Subject: Use $.extend() in mw.util and mw.util.jpegmeta so they can be loaded in either order... 
X-Git-Tag: 1.31.0-rc.0~29957
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=70096cfae052b9d78186f39524c6b05b344e34b1;p=lhc%2Fweb%2Fwiklou.git

Use $.extend() in mw.util and mw.util.jpegmeta so they can be loaded in either order. This means mw.util.jpegmeta doesn't depend on mw.util loading first any more
---

diff --git a/resources/mediawiki.util/mediawiki.util.jpegmeta.js b/resources/mediawiki.util/mediawiki.util.jpegmeta.js
index 852bf30299..08e0748384 100644
--- a/resources/mediawiki.util/mediawiki.util.jpegmeta.js
+++ b/resources/mediawiki.util/mediawiki.util.jpegmeta.js
@@ -724,8 +724,10 @@
 	
 	/* JsJpegMeta ends here */
 	
-	mw.util.jpegmeta = function( fileReaderResult, fileName ) {
-		return new JpegMeta.JpegFile( fileReaderResult, fileName );
-	};
+	mw.util = $.extend( mw.util || {}, {
+		jpegmeta: function( fileReaderResult, fileName ) {
+			return new JpegMeta.JpegFile( fileReaderResult, fileName );
+		}
+	} );
 	
 } )( jQuery, mediaWiki );
\ No newline at end of file
diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
index 4917856569..dd1e91163c 100644
--- a/resources/mediawiki.util/mediawiki.util.js
+++ b/resources/mediawiki.util/mediawiki.util.js
@@ -3,7 +3,7 @@
  */
 ( function( $, mw ) {
 
-	mw.util = {
+	mw.util = $.extend( mw.util || {}, {
 
 		/* Initialisation */
 		'initialised' : false,