#2482 Fix embedded content confirmation

6dbbf89d659db34375e094e7b67b825a982af9b2

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/scripts/extensions/regex/index.js+6 -6 Viewed

 import { callPopup, characters, eventSource, event_types, getCurrentChatId, reloadCurrentChat, saveSettingsDebounced, this_chid } from '../../../script.js';
 import { extension_settings, renderExtensionTemplateAsync, writeExtensionField } from '../../extensions.js';
 import { selected_group } from '../../group-chats.js';
+import { callGenericPopup, POPUP_TYPE } from '../../popup.js';
 import { SlashCommand } from '../../slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
 import { enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 import { SlashCommandEnumValue, enumTypes } from '../../slash-commands/SlashCommandEnumValue.js';
 import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
 import { download, getFileText, getSortableDelay, uuidv4 } from '../../utils.js';
-import { resolveVariable } from '../../variables.js';
 import { regex_placement, runRegexScript } from './engine.js';
 /**

             await onRegexEditorOpenClick(scriptHtml.attr('id'), isScoped);
         });
         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) {
                 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) {
                 return;

             download(fileData, fileName, 'application/json');
         });
         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) {
                 return;

                 if (!localStorage.getItem(checkKey)) {
                     localStorage.setItem(checkKey, 'true');
                     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) {
                         extension_settings.character_allowed_regex.push(avatar);

         template.find('#regex_import_target_global').on('input', () => target = 'global');
         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;
         for (const file of inputElement.files) {

public/scripts/world-info.js+2 -2 Viewed

 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { SlashCommandExecutor } from './slash-commands/SlashCommandExecutor.js';
 import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';
-import { Popup } from './popup.js';
+import { callGenericPopup, Popup, POPUP_TYPE } from './popup.js';
 export {
     world_info,

@@ -4224,7 +4224,7 @@ export function checkEmbeddedWorld(chid) {
4224	importEmbeddedWorldInfo(true);	4224	importEmbeddedWorldInfo(true);
4225	}	4225	}
4226	};	4226	};
4227	callPopup(html, 'confirm', '', { okButton: 'Yes' }).then(checkResult);	4227	callGenericPopup(html, POPUP_TYPE.CONFIRM, '', { okButton: 'Yes' }).then(checkResult);
4228	}	4228	}
4229	else {	4229	else {
4230	toastr.info(	4230	toastr.info(