extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 11:58:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid infinite loop if loading JS file fails

Browse Source
This commit is contained in:
nathangray 2021-06-17 14:17:58 -06:00
parent 69aaa14037
commit 5a209a00f0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,7 @@ egw.extend('files', egw.MODULE_WND_LOCAL, function(_app, _wnd)
promise = import(_prefix ? _prefix+src : src) promise = import(_prefix ? _prefix+src : src)
.catch((err) => { .catch((err) => {
console.error(src+": "+err.message); console.error(src+": "+err.message);
return Promise.reject(err.message);
}); });
} }
else else
@ -172,6 +173,7 @@ egw.extend('files', egw.MODULE_WND_LOCAL, function(_app, _wnd)
import(_prefix ? _prefix+src : src) import(_prefix ? _prefix+src : src)
.catch((err) => { .catch((err) => {
console.error(src+": "+err.message); console.error(src+": "+err.message);
return Promise.reject(err.message);
}) })
})); }));
} }

3
api/js/jsapi/egw_json.js
View File

@ -538,7 +538,8 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'undefined') else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'undefined')
{ {
return this.includeJS('/'+parts[1]+'/js/app.js', undefined, undefined, this.webserverUrl) return this.includeJS('/'+parts[1]+'/js/app.js', undefined, undefined, this.webserverUrl)
.then(() => this.applyFunc(_func, args, _context)); .then(() => this.applyFunc(_func, args, _context),
(err) => {console.error("Failure loading /"+parts[1]+'/js/app.js' + " (" + err + ")\nAborting.")});
} }
// check if we need a not yet instantiated app.js object --> instantiate it now // check if we need a not yet instantiated app.js object --> instantiate it now
else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'function') else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'function')