holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix after rollup build popups need extra reload

Browse Source 
caused by no longer necessary import of etemplate2 in egw.js, as Promise works and etemplate2 is global
This commit is contained in:
Ralf Becker 2021-07-07 10:32:06 +02:00
parent cf101c8e13
commit e8da7caa64
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,19 +372,17 @@ window.app = {classes: {}};
// load etemplate2 template(s) // load etemplate2 template(s)
jQuery('form.et2_container[data-etemplate]').each( function(index, node) jQuery('form.et2_container[data-etemplate]').each( function(index, node)
{ {
import('../etemplate/etemplate2').then((module) => { const data = JSON.parse(node.getAttribute('data-etemplate')) || {};
const data = JSON.parse(node.getAttribute('data-etemplate')) || {}; if (popup || window.opener && !egwIsMobile()) {
if (popup || window.opener && !egwIsMobile()) { // Resize popup when et2 load is done
// Resize popup when et2 load is done jQuery(node).on('load', () => window.setTimeout(resize_popup, 50));
jQuery(node).on('load', () => window.setTimeout(resize_popup, 50)); }
} const et2 = new etemplate2(node, "EGroupware\\Api\\Etemplate::ajax_process_content");
const et2 = new module.etemplate2(node, "EGroupware\\Api\\Etemplate::ajax_process_content"); et2.load(data.name, data.url, data.data);
et2.load(data.name, data.url, data.data); if (typeof data.response !== 'undefined') {
if (typeof data.response !== 'undefined') { const json_request = egw(window).json("");
const json_request = egw(window).json(""); json_request.handleResponse({response: data.response});
json_request.handleResponse({response: data.response}); }
}
}).catch((e) => alert(e.message+"\n\n"+e.stack));
}); });
// Offline/Online checking part // Offline/Online checking part

3
rollup.config.js
View File

@ -21,7 +21,7 @@ import { readdir,stat } from 'fs/promises';
rimraf.sync('./chunks/'); rimraf.sync('./chunks/');
// Turn on minification // Turn on minification
const do_minify = false; const do_minify = true;
const config = { const config = {
treeshake: false, treeshake: false,
@ -30,7 +30,6 @@ const config = {
// Note the .ts extension on the input - we build directly from the TypeScript when available // Note the .ts extension on the input - we build directly from the TypeScript when available
"pixelegg/js/fw_pixelegg.min": "pixelegg/js/fw_pixelegg.js", "pixelegg/js/fw_pixelegg.min": "pixelegg/js/fw_pixelegg.js",
"pixelegg/js/fw_mobile.min": "pixelegg/js/fw_mobile.js", "pixelegg/js/fw_mobile.min": "pixelegg/js/fw_mobile.js",
"api/js/etemplate/etemplate2.min":"api/js/etemplate/etemplate2.ts",
"api/js/egw_action/egw_dragdrop_dhtmlx_tree.min":"api/js/egw_action/egw_dragdrop_dhtmlx_tree.js", "api/js/egw_action/egw_dragdrop_dhtmlx_tree.min":"api/js/egw_action/egw_dragdrop_dhtmlx_tree.js",
"api/js/jsapi/egw.min": "api/js/jsapi/egw_modules.js", "api/js/jsapi/egw.min": "api/js/jsapi/egw_modules.js",