extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-09 16:35:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix async loading caused app.js not being loaded before et2.load() tried to instantiate it

Browse Source
This commit is contained in:
Ralf Becker
2021-06-08 17:13:30 +02:00
parent 8fa2bb466b
commit bfea641321
7 changed files with 35 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
api/js/jsapi/egw_lang.js
View File

@ -134,7 +134,7 @@ egw.extend('lang', egw.MODULE_GLOBAL, function()
* }
* @param {function} _callback called after loading, if not given ready event will be postponed instead
* @param {object} _context for callback
* @return Promise if no _callback specified
* @return Promise
*/
langRequire: function(_window, _apps, _callback, _context) {
// Get the ready and the files module for the given window
@ -161,32 +161,8 @@ egw.extend('lang', egw.MODULE_GLOBAL, function()
this.lang_order = apps.reverse();
}
// Only continue if we need to include a language
if (jss.length > 0)
{
if (typeof _callback == 'function')
{
files.includeJS(jss, _callback, _context || null);
}
else
{
// Require a "ready postpone token"
var token = ready.readyWaitFor();
return new Promise(function(resolve)
{
// Call "readyDone" once all js files have been included.
files.includeJS(jss, function () {
ready.readyDone(token);
resolve();
}, this);
});
}
}
else if (typeof _callback == 'function')
{
_callback.call(_context || null);
}
const promise = files.includeJS(jss, _callback, _context || null);
return typeof _callback === 'function' ? promise.then(_callback.call(_context)) : promise;
}
};