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

Et2Dialog: Move enter handler to keyUp so input event handlers can fire first

Browse Source
This commit is contained in:
nathan 2023-04-06 16:13:00 -06:00
parent 9a1593b154
commit 713c0ce21b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,7 +400,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
this._onClick = this._onClick.bind(this); this._onClick = this._onClick.bind(this);
this._onButtonClick = this._onButtonClick.bind(this); this._onButtonClick = this._onButtonClick.bind(this);
this._onMoveResize = this._onMoveResize.bind(this); this._onMoveResize = this._onMoveResize.bind(this);
this.handleKeyDown = this.handleKeyDown.bind(this); this.handleKeyUp = this.handleKeyUp.bind(this);
this._adoptTemplateButtons = this._adoptTemplateButtons.bind(this); this._adoptTemplateButtons = this._adoptTemplateButtons.bind(this);
// Don't leave it undefined, it's easier to deal with if it's just already resolved. // Don't leave it undefined, it's easier to deal with if it's just already resolved.
@ -419,6 +419,8 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
{ {
super.connectedCallback(); super.connectedCallback();
this.addEventListener("keyup", this.handleKeyUp);
// Prevent close if they click the overlay when the dialog is modal // Prevent close if they click the overlay when the dialog is modal
this.addEventListener('sl-request-close', event => this.addEventListener('sl-request-close', event =>
{ {
@ -436,6 +438,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
disconnectedCallback() disconnectedCallback()
{ {
super.disconnectedCallback(); super.disconnectedCallback();
this.removeEventListener("keyup", this.handleKeyUp);
this.removeEventListener("sl-hide", this.handleClose); this.removeEventListener("sl-hide", this.handleClose);
this.removeEventListener("sl-after-show", this.handleOpen); this.removeEventListener("sl-after-show", this.handleOpen);
} }
@ -476,11 +479,8 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
this.removeEventListener("keydown", this.handleKeyDown); this.removeEventListener("keydown", this.handleKeyDown);
} }
handleKeyDown(event : KeyboardEvent) handleKeyUp(event : KeyboardEvent)
{ {
// Parent handles escape, but is already bound
super.handleKeyDown(event);
// Trigger the "primary" or first button // Trigger the "primary" or first button
if(this.open && event.key === 'Enter') if(this.open && event.key === 'Enter')
{ {