Move closingPrevented to a property

367da588cd8356245a71ab2a534e67596ac51886

Wolfsblvt <wolfsblvt@gmail.com>

public/scripts/popup.js+4 -1 Viewed

     /** @type {Promise<any>} */ #promise;
     /** @type {(result: any) => any} */ #resolver;
+    /** @type {boolean} */ #isClosingPrevented;
     /**
      * Constructs a new Popup object with the given text content, type, inputValue, and options

         // It seems to just call 'close' on the dialog even if the 'cancel' event was prevented.
         // Here, we just say that close should not happen if the dalog has no result.
         const closeListener = async (evt) => {
-            if (this.result === undefined) {
+            if (this.#isClosingPrevented) {
                 evt.preventDefault();
                 evt.stopPropagation();
                 this.dlg.showModal();

         if (this.onClosing) {
             const shouldClose = this.onClosing(this);
             if (!shouldClose) {
+                this.#isClosingPrevented = true;
                 // Set values back if we cancel out of closing the popup
                 this.value = undefined;
                 this.result = undefined;

@@ -502,6 +504,7 @@ export class Popup {
502	return undefined;	504	return undefined;
503	}	505	}
504	}	506	}
		507	this.#isClosingPrevented = false;
505		508
506	Popup.util.lastResult = { value, result, inputResults: this.inputResults };	509	Popup.util.lastResult = { value, result, inputResults: this.inputResults };
507	this.#hide();	510	this.#hide();