extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add isReady flag to etemplate. onchange functions set as attributes in .xet files will not be called until the etemplate is finished loading.

Browse Source
This commit is contained in:
nathan 2023-02-27 15:31:07 -07:00
parent 0117c4bde3
commit 86b883951a
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/js/etemplate/Et2InputWidget/Et2InputWidget.ts
View File

@ -236,7 +236,10 @@ const Et2InputWidgetMixin = <T extends Constructor<LitElement>>(superclass : T)
*/ */
_oldChange(_ev : Event) : boolean _oldChange(_ev : Event) : boolean
{ {
if(typeof this.onchange == 'function') if(typeof this.onchange == 'function' && (
// If we have an instanceManager, make sure it's ready. Otherwise, we ignore the event
!this.getInstanceManager() || this.getInstanceManager().isReady
))
{ {
// Make sure function gets a reference to the widget, splice it in as 2. argument if not // Make sure function gets a reference to the widget, splice it in as 2. argument if not
let args = Array.prototype.slice.call(arguments); let args = Array.prototype.slice.call(arguments);

16
api/js/etemplate/etemplate2.ts
View File

@ -182,6 +182,13 @@ export class etemplate2
private app_obj : EgwApp; private app_obj : EgwApp;
app : string; app : string;
/**
* Flag indicating that all loading is done, and the etemplate is ready to be used by app.js
*
* onChange handler checks this to ignore change events before the etemplate is ready
*/
private ready : boolean = false;
constructor(_container : HTMLElement, _menuaction? : string, _uniqueId? : string) constructor(_container : HTMLElement, _menuaction? : string, _uniqueId? : string)
{ {
if(typeof _menuaction == "undefined") if(typeof _menuaction == "undefined")
@ -380,6 +387,11 @@ export class etemplate2
return this._etemplate_exec_id; return this._etemplate_exec_id;
} }
get isReady() : boolean
{
return this.ready;
}
/** /**
* Creates an associative array containing the data array managers for each part * Creates an associative array containing the data array managers for each part
* of the associative data array. A part is something like "content", "readonlys" * of the associative data array. A part is something like "content", "readonlys"
@ -532,6 +544,7 @@ export class etemplate2
*/ */
async load(_name, _url, _data, _callback?, _app?, _no_et2_ready?, _open_target?) async load(_name, _url, _data, _callback?, _app?, _no_et2_ready?, _open_target?)
{ {
this.ready = false;
let app = _app || window.app; let app = _app || window.app;
this.name = _name; // store top-level template name to have it available in widgets this.name = _name; // store top-level template name to have it available in widgets
// store template base url, in case initial template is loaded via webdav, to use that for further loads too // store template base url, in case initial template is loaded via webdav, to use that for further loads too
@ -739,6 +752,9 @@ export class etemplate2
this.focusOnFirstInput(); this.focusOnFirstInput();
} }
// Now etemplate is ready for others to interact with (eg: app.js)
this.ready = true;
// Tell others about it // Tell others about it
if(typeof _callback == "function") if(typeof _callback == "function")
{ {