From: Krinkle <krinkle@users.mediawiki.org>
Date: Sun, 29 May 2011 03:13:54 +0000 (+0000)
Subject: Introducing mw.libs, moving JpegMeta into it.
X-Git-Tag: 1.31.0-rc.0~29876
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=7d345f1836ae7333dcc0df24ad5ed002a9dff2e1;p=lhc%2Fweb%2Fwiklou.git

Introducing mw.libs, moving JpegMeta into it.
* Reverts/re-do's r88794 and r88796.
** mediawiki.util.js no longer extends itself but is defined once.
** mediawiki.util.jpegmeta no longer extends mw.util but is installed as an object property of mw.libs
* Empty placeholder defined in mediawiki.js
* Removed the redundant 'mw' argument from the IIFE around mediawiki.libs.jpegmeta.js


* Fixed all usages in /mediawiki/trunk/*
** http://toolserver.org/~krinkle/wikimedia-svn-search/view.php?id=205&hash=ddc0908eef111558816c9fe1c775f7c1
---

diff --git a/resources/Resources.php b/resources/Resources.php
index d566ee88c4..c198d86b08 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -456,8 +456,8 @@ return array(
 			'jquery.placeholder',
 		),
 	),
-	'mediawiki.util.jpegmeta' => array(
-		'scripts' => 'resources/mediawiki.util/mediawiki.util.jpegmeta.js',
+	'mediawiki.libs.jpegmeta' => array(
+		'scripts' => 'resources/mediawiki.libs/mediawiki.libs.jpegmeta.js',
 	),
 	'mediawiki.action.history' => array(
 		'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
@@ -529,7 +529,7 @@ return array(
 			'size-gigabytes',
 			'largefileserver',
 		),
-		'dependencies' => array( 'mediawiki.util.jpegmeta' ),
+		'dependencies' => array( 'mediawiki.libs.jpegmeta' ),
 	),
 
 	'mediawiki.language' => array(
diff --git a/resources/mediawiki.special/mediawiki.special.upload.js b/resources/mediawiki.special/mediawiki.special.upload.js
index cd986b4283..51f6bd8b71 100644
--- a/resources/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/mediawiki.special/mediawiki.special.upload.js
@@ -131,7 +131,7 @@ jQuery( function( $ ) {
 			img.src = dataURL;
 		}, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
 			try {
-				meta = mw.util.jpegmeta( data, file.fileName );
+				meta = mw.libs.jpegmeta( data, file.fileName );
 				meta._binary_data = null;
 			} catch ( e ) {
 				meta = null;
diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
index 6f08fc02f2..3ae2a7d6a2 100644
--- a/resources/mediawiki.util/mediawiki.util.js
+++ b/resources/mediawiki.util/mediawiki.util.js
@@ -3,7 +3,7 @@
  */
 ( function( $, mw ) {
 
-	mw.util = $.extend( mw.util || {}, {
+	mw.util = {
 
 		/* Initialisation */
 		/**
@@ -586,7 +586,7 @@
 				&& address.search( /::/ ) != -1 && address.search( /::.*::/ ) == -1;
 		}
 
-	} );
+	};
 
 	mw.util.init();
 
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 9bf9506f40..2a65c6c6e7 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -214,12 +214,12 @@ window.mediaWiki = new ( function( $ ) {
 	 */
 	this.log = function() { };
 
-	/*
-	 * Make the Map-class publicly available
+	/**
+	 * @var constructor Make the Map-class publicly available.
 	 */
 	this.Map = Map;
 
-	/*
+	/**
 	 * List of configuration values
 	 *
 	 * Dummy placeholder. Initiated in startUp module as a new instance of mw.Map().
@@ -228,6 +228,13 @@ window.mediaWiki = new ( function( $ ) {
 	 */
 	this.config = null;
 
+	/**
+	 * @var object
+	 *
+	 * Empty object that plugins can be installed in.
+	 */
+	this.libs = {};
+
 	/*
 	 * Localization system
 	 */