caption: update for new popup

b901ed1be761d47361003215d146dc23a2d049e4

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

public/scripts/extensions/caption/index.js+6 -5 Viewed

 import { ensureImageFormatSupported, getBase64Async, isTrueBoolean, saveBase64AsFile } from '../../utils.js';
 import { getContext, getApiUrl, doExtrasFetch, extension_settings, modules, renderExtensionTemplateAsync } from '../../extensions.js';
-import { appendMediaToMessage, callPopup, eventSource, event_types, getRequestHeaders, saveChatConditional, saveSettingsDebounced, substituteParamsExtended } from '../../../script.js';
+import { appendMediaToMessage, eventSource, event_types, getRequestHeaders, saveChatConditional, saveSettingsDebounced, substituteParamsExtended } from '../../../script.js';
 import { getMessageTimeStamp } from '../../RossAscends-mods.js';
 import { SECRET_KEYS, secret_state } from '../../secrets.js';
 import { getMultimodalCaption } from '../shared.js';

 import { SlashCommand } from '../../slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
 import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
+import { callGenericPopup, Popup, POPUP_TYPE } from '../../popup.js';
 export { MODULE_NAME };
 const MODULE_NAME = 'caption';

     let messageText = substituteParamsExtended(template, { caption: caption });
     if (extension_settings.caption.refine_mode) {
-        messageText = await callPopup(
+        messageText = await Popup.show.input(
-            '<h3>Review and edit the generated caption:</h3>Press "Cancel" to abort the caption sending.',
+            'Review and edit the generated caption:',
-            'input',
+            'Press "Cancel" to abort the caption sending.',
             messageText,
             { rows: 5, okButton: 'Send' });

     let prompt = externalPrompt || extension_settings.caption.prompt || PROMPT_DEFAULT;
     if (!externalPrompt && extension_settings.caption.prompt_ask) {
-        const customPrompt = await callPopup('<h3>Enter a comment or question:</h3>', 'input', prompt, { rows: 2 });
+        const customPrompt = await callGenericPopup('Enter a comment or question:', POPUP_TYPE.INPUT, prompt, { rows: 2 });
         if (!customPrompt) {
             throw new Error('User aborted the caption sending.');
+        }