extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove (unnecessary) double egw.min.js import

Browse Source
This commit is contained in:
Ralf Becker 2021-07-09 08:15:17 +02:00
parent ff92db4e33
commit edacfc12cb
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,15 +207,9 @@ window.app = {classes: {}};
})); }));
} }
const egw_modules = [
// TODO: Dev mode should remove .min or remap it with importmap
'egw.min'
];
// 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(egw_modules.map(mod => import(window.egw_webserverUrl+'/api/js/jsapi/'+mod+'.js')
.catch((err) => {console.error(rel_src+": "+err.message)}))))
.then(() => Promise.all(include.filter((src) => src.match(legacy_js_regexp) === null) //.reverse() .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) => {window.setTimeout(() => {throw err;},0)}) .catch((err) => {window.setTimeout(() => {throw err;},0)})

2
api/js/jsapi/egw_data.js
View File

@ -14,7 +14,7 @@
egw_core; egw_core;
egw_debug; egw_debug;
*/ */
import './egw_core.js'; import './egw.js';
import './egw_json.js'; // for egw.registerJSONPlugin import './egw_json.js'; // for egw.registerJSONPlugin
/** /**