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

Fix confirm dialog sometimes mis-placed initiating button in value

Browse Source
This commit is contained in:
nathan 2023-05-12 10:06:55 -06:00
parent 91c0a094a2
commit 3bd2ee5aad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1205,7 +1205,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
static confirm(_senders, _dialogMsg, _titleMsg, _postSubmit?) static confirm(_senders, _dialogMsg, _titleMsg, _postSubmit?)
{ {
let senders = _senders; let senders = _senders;
let buttonId = _senders.id; let button = _senders;
let dialogMsg = (typeof _dialogMsg != "undefined") ? _dialogMsg : ''; let dialogMsg = (typeof _dialogMsg != "undefined") ? _dialogMsg : '';
let titleMsg = (typeof _titleMsg != "undefined") ? _titleMsg : ''; let titleMsg = (typeof _titleMsg != "undefined") ? _titleMsg : '';
let egw = _senders instanceof et2_widget ? _senders.egw() : undefined; let egw = _senders instanceof et2_widget ? _senders.egw() : undefined;
@ -1215,7 +1215,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
{ {
if(_postSubmit) if(_postSubmit)
{ {
senders.getRoot().getInstanceManager().postSubmit(buttonId); senders.getRoot().getInstanceManager().postSubmit(button);
} }
else if(senders.instanceOf(et2_button) && senders.getType() !== "buttononly") else if(senders.instanceOf(et2_button) && senders.getType() !== "buttononly")
{ {
@ -1225,7 +1225,9 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
} }
else else
{ {
senders.getRoot().getInstanceManager().submit(buttonId); senders.clicked = true;
senders.getRoot().getInstanceManager().submit(button);
senders.clicked = false;
} }
} }
}; };