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

#2482 Fix embedded content confirmation

This commit is contained in:
Cohee 2024-07-06 16:55:57 +03:00
parent a6eec7ba1a
commit 6dbbf89d65
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/scripts/extensions/regex/index.js
View File

@ -1,13 +1,13 @@
import { callPopup, characters, eventSource, event_types, getCurrentChatId, reloadCurrentChat, saveSettingsDebounced, this_chid } from '../../../script.js'; import { callPopup, characters, eventSource, event_types, getCurrentChatId, reloadCurrentChat, saveSettingsDebounced, this_chid } from '../../../script.js';
import { extension_settings, renderExtensionTemplateAsync, writeExtensionField } from '../../extensions.js'; import { extension_settings, renderExtensionTemplateAsync, writeExtensionField } from '../../extensions.js';
import { selected_group } from '../../group-chats.js'; import { selected_group } from '../../group-chats.js';
import { callGenericPopup, POPUP_TYPE } from '../../popup.js';
import { SlashCommand } from '../../slash-commands/SlashCommand.js'; import { SlashCommand } from '../../slash-commands/SlashCommand.js';
import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js'; import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
import { enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js'; import { enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
import { SlashCommandEnumValue, enumTypes } from '../../slash-commands/SlashCommandEnumValue.js'; import { SlashCommandEnumValue, enumTypes } from '../../slash-commands/SlashCommandEnumValue.js';
import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js'; import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
import { download, getFileText, getSortableDelay, uuidv4 } from '../../utils.js'; import { download, getFileText, getSortableDelay, uuidv4 } from '../../utils.js';
import { resolveVariable } from '../../variables.js';
import { regex_placement, runRegexScript } from './engine.js'; import { regex_placement, runRegexScript } from './engine.js';
/** /**
@ -141,7 +141,7 @@ async function loadRegexScripts() {
await onRegexEditorOpenClick(scriptHtml.attr('id'), isScoped); await onRegexEditorOpenClick(scriptHtml.attr('id'), isScoped);
}); });
scriptHtml.find('.move_to_global').on('click', async function () { scriptHtml.find('.move_to_global').on('click', async function () {
const confirm = await callPopup('Are you sure you want to move this regex script to global?', 'confirm'); const confirm = await callGenericPopup('Are you sure you want to move this regex script to global?', POPUP_TYPE.CONFIRM);
if (!confirm) { if (!confirm) {
return; return;
@ -161,7 +161,7 @@ async function loadRegexScripts() {
return; return;
} }
const confirm = await callPopup('Are you sure you want to move this regex script to scoped?', 'confirm'); const confirm = await callGenericPopup('Are you sure you want to move this regex script to scoped?', POPUP_TYPE.CONFIRM);
if (!confirm) { if (!confirm) {
return; return;
@ -176,7 +176,7 @@ async function loadRegexScripts() {
download(fileData, fileName, 'application/json'); download(fileData, fileName, 'application/json');
}); });
scriptHtml.find('.delete_regex').on('click', async function () { scriptHtml.find('.delete_regex').on('click', async function () {
const confirm = await callPopup('Are you sure you want to delete this regex script?', 'confirm'); const confirm = await callGenericPopup('Are you sure you want to delete this regex script?', POPUP_TYPE.CONFIRM);
if (!confirm) { if (!confirm) {
return; return;
@ -442,7 +442,7 @@ async function checkEmbeddedRegexScripts() {
if (!localStorage.getItem(checkKey)) { if (!localStorage.getItem(checkKey)) {
localStorage.setItem(checkKey, 'true'); localStorage.setItem(checkKey, 'true');
const template = await renderExtensionTemplateAsync('regex', 'embeddedScripts', {}); const template = await renderExtensionTemplateAsync('regex', 'embeddedScripts', {});
const result = await callPopup(template, 'confirm', '', { okButton: 'Yes' }); const result = await callGenericPopup(template, POPUP_TYPE.CONFIRM, '', { okButton: 'Yes' });
if (result) { if (result) {
extension_settings.character_allowed_regex.push(avatar); extension_settings.character_allowed_regex.push(avatar);
@ -493,7 +493,7 @@ jQuery(async () => {
template.find('#regex_import_target_global').on('input', () => target = 'global'); template.find('#regex_import_target_global').on('input', () => target = 'global');
template.find('#regex_import_target_scoped').on('input', () => target = 'scoped'); template.find('#regex_import_target_scoped').on('input', () => target = 'scoped');
await callPopup(template, 'text'); await callGenericPopup(template, POPUP_TYPE.TEXT);
const inputElement = this instanceof HTMLInputElement && this; const inputElement = this instanceof HTMLInputElement && this;
for (const file of inputElement.files) { for (const file of inputElement.files) {

4
public/scripts/world-info.js
View File

@ -16,7 +16,7 @@ import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandE
import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js'; import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
import { SlashCommandExecutor } from './slash-commands/SlashCommandExecutor.js'; import { SlashCommandExecutor } from './slash-commands/SlashCommandExecutor.js';
import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js'; import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';
import { Popup } from './popup.js'; import { callGenericPopup, Popup, POPUP_TYPE } from './popup.js';
export { export {
world_info, world_info,
@ -4224,7 +4224,7 @@ export function checkEmbeddedWorld(chid) {
importEmbeddedWorldInfo(true); importEmbeddedWorldInfo(true);
} }
}; };
callPopup(html, 'confirm', '', { okButton: 'Yes' }).then(checkResult); callGenericPopup(html, POPUP_TYPE.CONFIRM, '', { okButton: 'Yes' }).then(checkResult);
} }
else { else {
toastr.info( toastr.info(