From 70096cfae052b9d78186f39524c6b05b344e34b1 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Wed, 25 May 2011 15:19:16 +0000 Subject: [PATCH] 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 --- resources/mediawiki.util/mediawiki.util.jpegmeta.js | 8 +++++--- resources/mediawiki.util/mediawiki.util.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) 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, -- 2.20.1