From bd93eeb85f4dc932c1a218c73c8359fd83959332 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Thu, 30 Dec 2010 12:22:39 +0000 Subject: [PATCH] (bug 26507) Wrap all ResourceLoader-served JS in (function($, mw) { code here })(jQuery, mediaWiki) so modules can always use $ as an alias for jQuery even if it's been unset in the global scope with jQuery.noConflict() --- includes/resourceloader/ResourceLoader.php | 2 +- resources/mediawiki/mediawiki.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index ce62b38540..a3c1cd13b1 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -533,7 +533,7 @@ class ResourceLoader { 'mediaWiki.loader.implement', array( $name, - new XmlJsCode( "function() {{$scripts}}" ), + new XmlJsCode( "function( $, mw ) {{$scripts}}" ), (object)$styles, (object)$messages ) ); diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index 8eab4ba076..7533c1e227 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -661,7 +661,7 @@ window.mediaWiki = new ( function( $ ) { } // Execute script try { - registry[module].script(); + registry[module].script( jQuery, mediaWiki ); registry[module].state = 'ready'; // Run jobs who's dependencies have just been met for ( var j = 0; j < jobs.length; j++ ) { -- 2.20.1