dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix escaping for MSSQL LIKE queries."
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki
/
mediawiki.js
diff --git
a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index
9d799db
..
4aad2ba
100644
(file)
--- a/
resources/src/mediawiki/mediawiki.js
+++ b/
resources/src/mediawiki/mediawiki.js
@@
-1189,11
+1189,18
@@
* @param {string} [moduleName] Name of currently executing module
* @return {jQuery.Promise}
*/
* @param {string} [moduleName] Name of currently executing module
* @return {jQuery.Promise}
*/
- function queueModuleScript( src ) {
+ function queueModuleScript( src
, moduleName
) {
var r = $.Deferred();
pendingRequests.push( function () {
var r = $.Deferred();
pendingRequests.push( function () {
+ if ( moduleName && hasOwn.call( registry, moduleName ) ) {
+ window.require = mw.loader.require;
+ window.module = registry[ moduleName ].module;
+ }
addScript( src ).always( function () {
addScript( src ).always( function () {
+ // Clear environment
+ delete window.require;
+ delete window.module;
r.resolve();
// Start the next one (if any)
r.resolve();
// Start the next one (if any)