mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-14 02:46:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44361-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2014-03-05 11:36:16 +08:00
parent baa1c69408 051548b897
commit 23d142ef5a
2046 changed files with 16260 additions and 15707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/javascript-static.js
View File

@ -667,34 +667,25 @@ M.util.js_pending = function(uniqid) {
return M.util.pending_js.length;
};
// Start this asap.
M.util.js_pending('init');
/**
* Register listeners for Y.io start/end so we can wait for them in behat.
*/
M.util.js_watch_io = function() {
YUI.add('moodle-core-io', function(Y) {
Y.on('io:start', function(id) {
M.util.js_pending('io:' + id);
});
Y.on('io:end', function(id) {
M.util.js_complete('io:' + id);
});
YUI.add('moodle-core-io', function(Y) {
Y.on('io:start', function(id) {
M.util.js_pending('io:' + id);
});
YUI.applyConfig({
modules: {
'moodle-core-io': {
after: ['io-base']
},
'io-base': {
requires: ['moodle-core-io'],
}
}
Y.on('io:end', function(id) {
M.util.js_complete('io:' + id);
});
};
// Start this asap.
M.util.js_pending('init');
M.util.js_watch_io();
}, '@VERSION@', {
condition: {
trigger: 'io-base',
when: 'after'
}
});
/**
* Unregister any long running javascript code by unique identifier.