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

Refactor Popup with private and readonly modifiers

This commit is contained in:
Wolfsblvt 2024-06-27 02:39:59 +02:00
parent 124cbfdfa4
commit d084f579c5
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
public/scripts/popup.js
View File

@ -102,24 +102,24 @@ const showPopupHelper = {
}; };
export class Popup { export class Popup {
/** @type {POPUP_TYPE} */ type; /** @readonly @type {POPUP_TYPE} */ type;
/** @type {string} */ id; /** @readonly @type {string} */ id;
/** @type {HTMLDialogElement} */ dlg; /** @readonly @type {HTMLDialogElement} */ dlg;
/** @type {HTMLDivElement} */ body; /** @readonly @type {HTMLDivElement} */ body;
/** @type {HTMLDivElement} */ content; /** @readonly @type {HTMLDivElement} */ content;
/** @type {HTMLTextAreaElement} */ mainInput; /** @readonly @type {HTMLTextAreaElement} */ mainInput;
/** @type {HTMLDivElement} */ inputControls; /** @readonly @type {HTMLDivElement} */ inputControls;
/** @type {HTMLDivElement} */ buttonControls; /** @readonly @type {HTMLDivElement} */ buttonControls;
/** @type {HTMLDivElement} */ okButton; /** @readonly @type {HTMLDivElement} */ okButton;
/** @type {HTMLDivElement} */ cancelButton; /** @readonly @type {HTMLDivElement} */ cancelButton;
/** @type {HTMLDivElement} */ closeButton; /** @readonly @type {HTMLDivElement} */ closeButton;
/** @type {HTMLDivElement} */ cropWrap; /** @readonly @type {HTMLDivElement} */ cropWrap;
/** @type {HTMLImageElement} */ cropImage; /** @readonly @type {HTMLImageElement} */ cropImage;
/** @type {POPUP_RESULT|number?} */ defaultResult; /** @readonly @type {POPUP_RESULT|number?} */ defaultResult;
/** @type {CustomPopupButton[]|string[]?} */ customButtons; /** @readonly @type {CustomPopupButton[]|string[]?} */ customButtons;
/** @type {CustomPopupInput[]} */ customInputs; /** @readonly @type {CustomPopupInput[]} */ customInputs;
/** @type {(popup: Popup) => boolean?} */ onClosing; /** @type {(popup: Popup) => boolean?} */ onClosing;
/** @type {(popup: Popup) => void?} */ onClose; /** @type {(popup: Popup) => void?} */ onClose;
@ -131,8 +131,8 @@ export class Popup {
/** @type {HTMLElement} */ lastFocus; /** @type {HTMLElement} */ lastFocus;
/** @type {Promise<any>} */ promise; /** @type {Promise<any>} */ #promise;
/** @type {(result: any) => any} */ resolver; /** @type {(result: any) => any} */ #resolver;
/** /**
* Constructs a new Popup object with the given text content, type, inputValue, and options * Constructs a new Popup object with the given text content, type, inputValue, and options
@ -378,10 +378,10 @@ export class Popup {
this.dlg.removeAttribute('opening'); this.dlg.removeAttribute('opening');
}); });
this.promise = new Promise((resolve) => { this.#promise = new Promise((resolve) => {
this.resolver = resolve; this.#resolver = resolve;
}); });
return this.promise; return this.#promise;
} }
setAutoFocus({ applyAutoFocus = false } = {}) { setAutoFocus({ applyAutoFocus = false } = {}) {
@ -462,14 +462,13 @@ export class Popup {
} }
Popup.util.lastResult = { value, result }; Popup.util.lastResult = { value, result };
this.hide(); this.#hide();
} }
/** /**
* Hides the popup, using the internal resolver to return the value to the original show promise * Hides the popup, using the internal resolver to return the value to the original show promise
* @private
*/ */
hide() { #hide() {
// We close the dialog, first running the animation // We close the dialog, first running the animation
this.dlg.setAttribute('closing', ''); this.dlg.setAttribute('closing', '');
@ -503,7 +502,7 @@ export class Popup {
} }
} }
this.resolver(this.value); this.#resolver(this.value);
}); });
} }