a408328f · permissionBRICK/SillyTavern

 'use strict';
-import { callPopup, event_types, eventSource, is_send_press, main_api, substituteParams } from '../script.js';
+import { event_types, eventSource, is_send_press, main_api, substituteParams } from '../script.js';
 import { is_group_generating } from './group-chats.js';
 import { Message, TokenHandler } from './openai.js';
 import { power_user } from './power-user.js';
 import { debounce, waitUntilCondition, escapeHtml } from './utils.js';
 import { debounce_timeout } from './constants.js';
 import { renderTemplateAsync } from './templates.js';
+import { Popup } from './popup.js';
 function debouncePromise(func, delay) {
     let timeoutId;

         };
         // Delete selected prompt from list form and close edit form
-        this.handleDeletePrompt = (event) => {
+        this.handleDeletePrompt = async (event) => {
-            const promptID = document.getElementById(this.configuration.prefix + 'prompt_manager_footer_append_prompt').value;
+            Popup.show.confirm('Are you sure you want to delete this prompt?', null).then((userChoice) => {
-            const prompt = this.getPromptById(promptID);
+                if (!userChoice) return;
+                const promptID = document.getElementById(this.configuration.prefix + 'prompt_manager_footer_append_prompt').value;
+                const prompt = this.getPromptById(promptID);
-            if (prompt && true === this.isPromptDeletionAllowed(prompt)) {
+                if (prompt && true === this.isPromptDeletionAllowed(prompt)) {
-                const promptIndex = this.getPromptIndexById(promptID);
+                    const promptIndex = this.getPromptIndexById(promptID);
-                this.serviceSettings.prompts.splice(Number(promptIndex), 1);
+                    this.serviceSettings.prompts.splice(Number(promptIndex), 1);
-                this.log('Deleted prompt: ' + prompt.identifier);
+                    this.log('Deleted prompt: ' + prompt.identifier);
-                this.hidePopup();
+                    this.hidePopup();
-                this.clearEditForm();
+                    this.clearEditForm();
-                this.render();
+                    this.render();
-                this.saveServiceSettings();
+                    this.saveServiceSettings();
-            }
+                }
+            });
         };
         // Create new prompt, then save it to settings and close form.

         // Import prompts for the selected character
         this.handleImport = () => {
-            callPopup('Existing prompts with the same ID will be overridden. Do you want to proceed?', 'confirm')
+            Popup.show.confirm('Existing prompts with the same ID will be overridden. Do you want to proceed?', null)
                 .then(userChoice => {
-                    if (false === userChoice) return;
+                    if (!userChoice) return;
                     const fileOpener = document.createElement('input');
                     fileOpener.type = 'file';

         // Restore default state of a characters prompt order
         this.handleCharacterReset = () => {
-            callPopup('This will reset the prompt order for this character. You will not lose any prompts.', 'confirm')
+            Popup.show.confirm('This will reset the prompt order for this character. You will not lose any prompts.', null)
                 .then(userChoice => {
-                    if (false === userChoice) return;
+                    if (!userChoice) return;
                     this.removePromptOrderForCharacter(this.activeCharacter);
                     this.addPromptOrderForCharacter(this.activeCharacter, promptManagerDefaultPromptOrder);

             const encodedName = escapeHtml(prompt.name);
             const isMarkerPrompt = prompt.marker && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE;
             const isSystemPrompt = !prompt.marker && prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE && !prompt.forbid_overrides;
-            const isImportantPrompt = !prompt.marker && prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE  && prompt.forbid_overrides;
+            const isImportantPrompt = !prompt.marker && prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE && prompt.forbid_overrides;
             const isUserPrompt = !prompt.marker && !prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE;
             const isInjectionPrompt = prompt.injection_position === INJECTION_POSITION.ABSOLUTE;
             const isOverriddenPrompt = Array.isArray(this.overriddenPrompts) && this.overriddenPrompts.includes(prompt.identifier);

Confirm custom PM prompt deletion