extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2Dialog fixes

Browse Source 
- Fix noCloseButton attribute was not implemented
- Fix hideOnExcape=false still allowed closing on escape
- Fix using Et2Dialog.BUTTONS_OK showed no buttons
This commit is contained in:
nathan 2023-06-30 11:01:22 -06:00
parent 65b239ca2c
commit f4699543c3
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,14 +235,23 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
/* Non-modal dialogs don't have an overlay */
:host(:not([isModal])) .dialog, :host(:not([isModal])) .dialog__overlay {
:host(:not([ismodal])) .dialog, :host(:not([isModal])) .dialog__overlay {
pointer-events: none;
background: transparent;
}
:host(:not([isModal])) .dialog__panel {
:host(:not([ismodal])) .dialog__panel {
pointer-events: auto;
}
/* Hide close button when set */
:host([noclosebutton]) .dialog__close {
display: none;
}
/* Button alignments */
::slotted([align="left"]) {
margin-right: auto;
order: -1;
@ -311,7 +320,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
/**
* When set to true it removes the close button from dialog's header
*/
noCloseButton: Boolean
noCloseButton: {type: Boolean, reflect: true}
}
}
@ -424,9 +433,17 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
// Prevent close if they click the overlay when the dialog is modal
this.addEventListener('sl-request-close', event =>
{
// Prevent close on clicking somewhere else
if(this.isModal && event.detail.source === 'overlay')
{
event.preventDefault();
return;
}
// Prevent close on escape
if(!this.hideOnEscape && event.detail.source === 'keyboard')
{
event.preventDefault();
return;
}
})
@ -871,7 +888,8 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
_buttonsTemplate()
{
if(!this.buttons)
// No buttons set, but careful with BUTTONS_OK
if(!this.buttons && this.buttons !== Et2Dialog.BUTTONS_OK)
{
return;
}