http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89083
Revision: 89083 Author: krinkle Date: 2011-05-29 03:13:54 +0000 (Sun, 29 May 2011) Log Message: ----------- 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 Modified Paths: -------------- trunk/phase3/resources/Resources.php trunk/phase3/resources/mediawiki/mediawiki.js trunk/phase3/resources/mediawiki.special/mediawiki.special.upload.js trunk/phase3/resources/mediawiki.util/mediawiki.util.js Modified: trunk/phase3/resources/Resources.php =================================================================== --- trunk/phase3/resources/Resources.php 2011-05-29 02:54:01 UTC (rev 89082) +++ trunk/phase3/resources/Resources.php 2011-05-29 03:13:54 UTC (rev 89083) @@ -456,8 +456,8 @@ '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 @@ 'size-gigabytes', 'largefileserver', ), - 'dependencies' => array( 'mediawiki.util.jpegmeta' ), + 'dependencies' => array( 'mediawiki.libs.jpegmeta' ), ), 'mediawiki.language' => array( Modified: trunk/phase3/resources/mediawiki/mediawiki.js =================================================================== --- trunk/phase3/resources/mediawiki/mediawiki.js 2011-05-29 02:54:01 UTC (rev 89082) +++ trunk/phase3/resources/mediawiki/mediawiki.js 2011-05-29 03:13:54 UTC (rev 89083) @@ -214,12 +214,12 @@ */ 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 @@ */ this.config = null; + /** + * @var object + * + * Empty object that plugins can be installed in. + */ + this.libs = {}; + /* * Localization system */ Modified: trunk/phase3/resources/mediawiki.special/mediawiki.special.upload.js =================================================================== --- trunk/phase3/resources/mediawiki.special/mediawiki.special.upload.js 2011-05-29 02:54:01 UTC (rev 89082) +++ trunk/phase3/resources/mediawiki.special/mediawiki.special.upload.js 2011-05-29 03:13:54 UTC (rev 89083) @@ -131,7 +131,7 @@ 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; Modified: trunk/phase3/resources/mediawiki.util/mediawiki.util.js =================================================================== --- trunk/phase3/resources/mediawiki.util/mediawiki.util.js 2011-05-29 02:54:01 UTC (rev 89082) +++ trunk/phase3/resources/mediawiki.util/mediawiki.util.js 2011-05-29 03:13:54 UTC (rev 89083) @@ -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(); _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
