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

Dialog work

Browse Source 
- Add destroy() to remove dialog

Fixes admin ACL dialog
This commit is contained in:
nathan 2022-12-01 10:24:17 -07:00
parent d6d77546a5
commit 83ab58329e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,6 +386,15 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
this.removeEventListener("sl-after-show", this.handleOpen); this.removeEventListener("sl-after-show", this.handleOpen);
} }
destroy()
{
if(this.template)
{
this.template.clear(true);
}
this.remove();
}
addOpenListeners() addOpenListeners()
{ {
//super.addOpenListeners(); //super.addOpenListeners();

8
calendar/js/app.ts
View File

@ -2088,12 +2088,12 @@ export class CalendarApp extends EgwApp
return false; return false;
} }
// Insert the content into the correct place // Insert the content into the correct place
add_dialog._overlayContentNode._contentNode.remove(); add_dialog._contentNode.remove();
add_dialog._overlayContentNode.insertAdjacentHTML("beforeend", content.html); add_dialog.insertAdjacentHTML("beforeend", content.html);
let template = add_dialog._overlayContentNode.querySelector("[id='calendar-add']"); let template = add_dialog.querySelector("[id='calendar-add']");
if(template) if(template)
{ {
template.slot = "content"; template.slot = "";
template.addEventListener("load", add_dialog._adoptTemplateButtons); template.addEventListener("load", add_dialog._adoptTemplateButtons);
} }
} }