Merge "resourceloader: qualify $ variable in script() call to handle the case of...

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index ad020b5..4ce6ff8 100644 (file)
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1081,7 +1081,7 @@
                                                } else if ( typeof script === 'function' ) {
                                                        // Pass jQuery twice so that the signature of the closure which wraps
                                                        // the script can bind both '$' and 'jQuery'.
-                                                       script( $, $, mw.loader.require, registry[ module ].module );
+                                                       script( window.$, window.$, mw.loader.require, registry[ module ].module );
                                                        markModuleReady();
 
                                                } else if ( typeof script === 'string' ) {