From 9adb343cf58e37ca79db24ad96954f67253f7c1f Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Mon, 9 Oct 2023 22:06:39 +0000
Subject: [PATCH] update

---
 UI/Component/Form.js | 3 +--
 Views/FormView.js    | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/UI/Component/Form.js b/UI/Component/Form.js
index 277aa44..3973d72 100755
--- a/UI/Component/Form.js
+++ b/UI/Component/Form.js
@@ -729,8 +729,6 @@ export class Form
 
     formActionCancel (self, event, id, elementIndex)
     {
-        jsOMS.preventAll(event);
-
         const ele = document.getElementById(id);
         if (ele.getAttribute('data-update-form') === null && ele.tagName.toLowerCase() !== 'form') {
             this.formActionCancelInline(self, event, id, elementIndex);
@@ -974,6 +972,7 @@ export class Form
         } else if ((elementIndex = Array.from(self.forms[id].getSave()).indexOf(event.target)) !== -1) {
             this.formActionSave(self, event, id, elementIndex);
         } else if ((elementIndex = Array.from(self.forms[id].getCancel()).indexOf(event.target)) !== -1) {
+            jsOMS.preventAll(event);
             // @todo currently only handling update cancel, what about add cancel?
             this.formActionCancel(self, event, id, elementIndex);
         } else if ((elementIndex = Array.from(self.forms[id].getUpdate()).indexOf(event.target)) !== -1) {
diff --git a/Views/FormView.js b/Views/FormView.js
index d199661..fcf7c91 100755
--- a/Views/FormView.js
+++ b/Views/FormView.js
@@ -236,11 +236,16 @@ export class FormView
         const parent = e === null ? document : e;
 
         return parent.querySelectorAll(
-            'button[form=' + this.id + '].cancel-form, '
+            '#' + this.id + ' input[type=reset], '
+            + 'button[form=' + this.id + '][type=reset], '
+            + 'input[form=' + this.id + '][type=reset], '
+            + '#' + this.id + ' button[type=reset], '
+            + 'button[form=' + this.id + '].cancel-form, '
             + '.cancel-form[data-form=' + this.id + '], '
             + '#' + this.id + ' .cancel-form, '
             + '[form="' + this.id + '"].cancel-form'
             + (e !== null ? ', .cancel-form' : '')
+
         );
     };