Trigger the `cancel` event when the dialog is closed with `Esc`

See https://www.woltlab.com/community/thread/303492-confirmationfactory-und-escape/

diff --git a/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts b/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts
index ca25d8df426a1f56eed22f1bcee5d48c8fbf1e5e..f2a9ef4ba88ac1b29552e590ed13ec6826d79bc8 100644 (file)
--- a/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts
+++ b/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts
@@ -273,11 +273,9 @@ export class WoltlabCoreDialogElement extends HTMLElement {
     this.#dialog.classList.add("dialog");
     this.#dialog.setAttribute("aria-labelledby", DomUtil.identify(this.#title));
 
-    this.#dialog.addEventListener("cancel", (event) => {
-      if (!this.#shouldClose()) {
-        event.preventDefault();
-        return;
-      }
+    this.#dialog.addEventListener("cancel", () => {
+      const event = new CustomEvent("cancel");
+      this.dispatchEvent(event);
 
       this.#detachDialog();
     });

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js
index f780c88971b470c183e6b68b49829ab79a9feec3..06682859d59c0716d57833ffe87b9aa0fcebb2b3 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js
@@ -207,11 +207,9 @@ define(["require", "exports", "tslib", "../Dom/Util", "../Helper/PageOverlay", "
             this.#dialog.append(doc);
             this.#dialog.classList.add("dialog");
             this.#dialog.setAttribute("aria-labelledby", Util_1.default.identify(this.#title));
-            this.#dialog.addEventListener("cancel", (event) => {
-                if (!this.#shouldClose()) {
-                    event.preventDefault();
-                    return;
-                }
+            this.#dialog.addEventListener("cancel", () => {
+                const event = new CustomEvent("cancel");
+                this.dispatchEvent(event);
                 this.#detachDialog();
             });
             // Close the dialog by clicking on the backdrop.