rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow popup buttons returning 'null' for cancelled

Browse Source
This commit is contained in:
Wolfsblvt
2024-07-12 00:29:16 +02:00
parent c90a25e0cd
commit 4c7e5fbd60
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/scripts/popup.js
View File

@ -194,7 +194,7 @@ export class Popup {
const buttonElement = document.createElement('div'); const buttonElement = document.createElement('div');
buttonElement.classList.add('menu_button', 'popup-button-custom', 'result-control'); buttonElement.classList.add('menu_button', 'popup-button-custom', 'result-control');
buttonElement.classList.add(...(button.classes ?? [])); buttonElement.classList.add(...(button.classes ?? []));
buttonElement.dataset.result = String(button.result ?? undefined); buttonElement.dataset.result = String(button.result); // This is expected to also write 'null' or 'staging', to indicate cancel and no action respectively
buttonElement.textContent = button.text; buttonElement.textContent = button.text;
buttonElement.dataset.i18n = buttonElement.textContent; buttonElement.dataset.i18n = buttonElement.textContent;
buttonElement.tabIndex = 0; buttonElement.tabIndex = 0;
@ -317,9 +317,14 @@ export class Popup {
// Bind event listeners for all result controls to their defined event type // Bind event listeners for all result controls to their defined event type
this.dlg.querySelectorAll('[data-result]').forEach(resultControl => { this.dlg.querySelectorAll('[data-result]').forEach(resultControl => {
if (!(resultControl instanceof HTMLElement)) return; if (!(resultControl instanceof HTMLElement)) return;
const result = Number(resultControl.dataset.result); // If no value was set, we exit out and don't bind an action
if (String(undefined) === String(resultControl.dataset.result)) return; if (String(resultControl.dataset.result) === String(undefined)) return;
if (isNaN(result)) throw new Error('Invalid result control. Result must be a number. ' + resultControl.dataset.result);
// Make sure that both `POPUP_RESULT` numbers and also `null` as 'cancelled' are supported
const result = String(resultControl.dataset.result) === String(null) ? null
: Number(resultControl.dataset.result);
if (result !== null && isNaN(result)) throw new Error('Invalid result control. Result must be a number. ' + resultControl.dataset.result);
const type = resultControl.dataset.resultEvent || 'click'; const type = resultControl.dataset.resultEvent || 'click';
resultControl.addEventListener(type, async () => await this.complete(result)); resultControl.addEventListener(type, async () => await this.complete(result));
}); });