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

defer calls to app.* after et2_load is finished

Browse Source 
changing et2_load egw_json plugin to return a promise for that
This commit is contained in:
Ralf Becker
2021-06-11 09:05:57 +02:00
parent 81c4df47f2
commit e18832e110
5 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/js/etemplate/et2_core_xml.js
View File

@ -18,6 +18,7 @@ import { egw } from "../jsapi/egw_global";
* @param {function} _callback function(_xml)
* @param {object} _context for _callback
* @param {function} _fail_callback function(_xml)
* @return Promise
*/
export function et2_loadXMLFromURL(_url, _callback, _context, _fail_callback) {
if (typeof _context == "undefined") {
@ -36,7 +37,7 @@ export function et2_loadXMLFromURL(_url, _callback, _context, _fail_callback) {
if (typeof win == "undefined") {
win = egw.top;
}
win.jQuery.ajax({
return win.jQuery.ajax({
// we add the full url (protocol and domain) as sometimes just the path
// gives a CSP error interpreting it as file:///path
// (if there are a enough 404 errors in html content ...)
@ -45,11 +46,13 @@ export function et2_loadXMLFromURL(_url, _callback, _context, _fail_callback) {
type: 'GET',
dataType: 'xml',
success: function (_data, _status, _xmlhttp) {
_callback.call(_context, _data.documentElement);
if (typeof _callback === 'function') {
_callback.call(_context, _data.documentElement);
}
},
error: function (_xmlhttp, _err) {
egw().debug('error', 'Loading eTemplate from ' + _url + ' failed! ' + _xmlhttp.status + ' ' + _xmlhttp.statusText);
if (typeof _fail_callback !== 'undefined') {
if (typeof _fail_callback === 'function') {
_fail_callback.call(_context, _err);
}
}