rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move closingPrevented to a property

This commit is contained in:
Wolfsblvt 2024-07-14 22:37:22 +02:00
parent 7b7c1121bb
commit 367da588cd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/scripts/popup.js
View File

@ -135,6 +135,7 @@ export class Popup {
/** @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
@ -342,7 +343,7 @@ export class Popup {
// 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();
@ -495,6 +496,7 @@ export class Popup {
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 {
return undefined;
}
}
this.#isClosingPrevented = false;
Popup.util.lastResult = { value, result, inputResults: this.inputResults };
this.#hide();