extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-12 17:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix async loading caused et2 widgets calling api before loaded

Browse Source 
using a strict order now:
1. legacy stuff like jquery and dhtmlx
2. client-side api / egw-object
3. et2 and rest
This commit is contained in:
Ralf Becker 2021-06-14 14:15:58 +02:00
parent b4c4606c22
commit 1035ff31ec
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/js/jsapi/egw.js
View File

@ -206,12 +206,19 @@ window.app = {classes: {}};
})); }));
} }
const egw_modules = [
'egw_core', 'egw_debug', 'egw_preferences', 'egw_lang', 'egw_links', 'egw_open', 'egw_user',
'egw_config', 'egw_images', 'egw_jsonq', 'egw_files', 'egw_json', 'egw_store', 'egw_tooltip', 'egw_css',
'egw_calendar', 'egw_ready', 'egw_data', 'egw_tail', 'egw_message', 'egw_notification'
];
// make our promise global, as legacy code calls egw_LAB.wait which we assign to egw_ready.then // make our promise global, as legacy code calls egw_LAB.wait which we assign to egw_ready.then
window.egw_LAB = window.egw_ready = window.egw_LAB = window.egw_ready =
legacy_js_import(include.filter((src) => src.match(legacy_js_regexp) !== null), window.egw_webserverUrl) legacy_js_import(include.filter((src) => src.match(legacy_js_regexp) !== null), window.egw_webserverUrl)
.then(() => Promise.all(include.filter((src) => src.match(legacy_js_regexp) === null) .then(Promise.all(egw_modules.map(mod => import(window.egw_webserverUrl+'/api/js/jsapi/'+mod+'.js')
.catch((err) => {console.log(rel_src+":\n\n"+err.message)}))))
.then(() => Promise.all(include.filter((src) => src.match(legacy_js_regexp) === null) //.reverse()
.map(rel_src => import(window.egw_webserverUrl+'/'+rel_src) .map(rel_src => import(window.egw_webserverUrl+'/'+rel_src)
.catch((err) => { console.log(rel_src+":\n\n"+err.message)}) .catch((err) => {console.log(rel_src+":\n\n"+err.message)})
))).then(() => ))).then(() =>
{ {
// We need to override the globalEval to mitigate potential execution of // We need to override the globalEval to mitigate potential execution of