extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Et2Dialog: Second try waiting on template load

Browse Source 
Now creating the template promise immediately on setting template name and using a resolver function to resolve after template is loaded
This commit is contained in:
nathan 2022-12-14 10:39:15 -07:00
parent d1e134677a
commit 54498a005c
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
api/js/etemplate/Et2Dialog/Et2Dialog.ts
View File

@ -151,6 +151,15 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
*/
protected _complete_promise : Promise<[number, Object]>;
/**
* Resolve the template promise
*/
private _templateResolver : (value) => void;
/**
* Resolve the dialog complete promise
*/
private _completeResolver : (value) => [number, Object];
/**
* The ID of the button that was clicked. Always one of the button constants,
* unless custom buttons were used
@ -492,10 +501,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
await super.getUpdateComplete();
// Wait for template to finish loading
if(this._template_widget)
{
await this._template_promise;
}
await this._template_promise;
}
getComplete() : Promise<[number, Object]>
@ -667,6 +673,16 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
{
let old_template = this.__template;
this.__template = new_template_name;
// Create the new promise here so we can wait for it immediately, not in update
this._template_promise = new Promise<boolean>((resolve) =>
{
this._templateResolver = value => resolve(value);
});
if(!this.__template)
{
this._templateResolver(true);
}
this.requestUpdate("template", old_template);
}
@ -689,7 +705,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
if(changedProperties.has("template"))
{
// Wait until update is finished to avoid an error in Safari
this.updateComplete.then(() => this._loadTemplate());
super.getUpdateComplete().then(() => this._loadTemplate());
}
if(changedProperties.has("buttons"))
{
@ -742,14 +758,22 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
template += '?' + ((new Date).valueOf() / 86400 | 0).toString();
}
// File name provided, fetch from server
this._template_promise = this._template_widget.load("", template, this.__value || {content: {}},);
this._template_widget.load("", template, this.__value || {content: {}},)
.then(() =>
{
this._templateResolver(true);
});
}
else
{
// Just template name, it better be loaded already
this._template_promise = this._template_widget.load(this.__template, '', this.__value || {},
this._template_widget.load(this.__template, '', this.__value || {},
// true: do NOT call et2_ready, as it would overwrite this.et2 in app.js
undefined, undefined, true);
undefined, undefined, true)
.then(() =>
{
this._templateResolver(true);
});
}
// Don't let dialog closing destroy the parent session

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

@ -461,7 +461,8 @@ egw.extend('timer', egw.MODULE_GLOBAL, function()
});
// Add to DOM, dialog will auto-open
document.body.appendChild(dialog);
dialog.getUpdateComplete().then(() => {
dialog.updateComplete.then(() =>
{
// enable/disable buttons based on timer state
setButtonState();
// update timers in dialog