Merge pull request #2521 from SillyTavern/char-action-popups Update most char submenu popups to new popup

4372d214c899d57ede98094209b4d85cd478b5e6

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

Signed

Parents: 5bb20519b738b8436c95b30830369c32b1869f84 a037129c20869a8d9e74aeb2a20eebefbad88e2c

public/index.html+0 -17 Viewed

         </div>
     </div>
     <!-- templates for JS to reuse when needed -->
 -    <div id="scenario_override_template" class="template_element">
 -        <div class="scenario_override range-block flexFlowColumn flex-container">
 -            <div class="range-block-title title_restorable">
 -                <h3><span data-i18n="Chat Scenario Override" class="margin0">Chat Scenario Override</span></h3>
 -                <div title="Remove" data-i18n="[title]Remove" class="menu_button fa-solid fa-trash-can remove_scenario_override"></div>
 -            </div>
 -            <div class="range-block-counter justifyLeft flex-container flexFlowColumn">
 -                <strong>Unique to this chat.</strong>
 -                <span data-group="true">All group members will use the following scenario text instead of what is specified in their character cards.</span>
 -                <span data-character="true">The following scenario text will be used instead of the value set in the character card.</span>
 -                Checkpoints inherit the scenario override from their parent, and can be changed individually after that.
 -            </div>
 -            <div class="range-block-range wide100p">
 -                <textarea class="wide100p chat_scenario" class="text_pole" rows="15" data-i18n="[placeholder]Type here..." placeholder="Type here..."></textarea>
 -            </div>
 -        </div>
 -    </div>
     <div id="chat_world_template" class="template_element">
         <div class="chat_world range-block flexFlowColumn flex-container">
             <div class="range-block-title">

public/script.js+13 -10 Viewed

     $('#favorite_button').toggleClass('fav_off', !fav_ch_checked);
+}
 export async function setScenarioOverride() {
     if (!selected_group && !this_chid) {
         console.warn('setScenarioOverride() -- no selected group or character');
         return;
+    }
 -    const template = $('#scenario_override_template .scenario_override').clone();
     const metadataValue = chat_metadata['scenario'] || '';
     const isGroup = !!selected_group;
 -    template.find('[data-group="true"]').toggle(isGroup);
++
 -    template.find('[data-character="true"]').toggle(!isGroup);
 +    const $template = $(await renderTemplateAsync('scenarioOverride'));
 -    template.find('.chat_scenario').val(metadataValue).on('input', onScenarioOverrideInput);
 +    $template.find('[data-group="true"]').toggle(isGroup);
     $template.find('.remove_scenario_override[data-character="true"]').ontoggle('click', onScenarioOverrideRemoveClick!isGroup);
 -    callPopup(template, 'text');
 +    // TODO: Why does this save on every character input? Save on popup close
 +    $template.find('.chat_scenario').val(metadataValue).on('input', onScenarioOverrideInput);
 +    $template.find('.remove_scenario_override').on('click', onScenarioOverrideRemoveClick);
++
 +    await callGenericPopup($template, POPUP_TYPE.TEXT, '');
+}
 function onScenarioOverrideInput() {

                 openCharacterWorldPopup();
                 break;
             case 'set_chat_scenario':
                 await setScenarioOverride();
                 break;
             case 'renameCharButton':
                 renameCharacter();

                 const source = getCharacterSource(this_chid);
                 if (source && isValidUrl(source)) {
                     const url = new URL(source);
                     const confirm = await callPopupPopup.show.confirm(`'Open Source', `<span>Do you want to open the link to ${url.hostname} in a new tab?</span><var>${url}</var>`, 'confirm');
                     if (confirm) {
                         window.open(source, '_blank');
+                    }

+                }
             } break;
             case 'replace_update': {
                 const confirm = await callPopupPopup.show.confirm('Replace Character', '<p><b>Choose a new character card to replace this character with.</b></p><p>All chats, assets and group memberships will be preserved, but local changes to the character data will be lost.<br /p><p>Proceed?</p>', 'confirm', '');
                 if (confirm) {
                     async function uploadReplacementCard(e) {
                         const file = e.target.files[0];

public/scripts/personas.js+4 -7 Viewed

     const overwriteName = `${name} (Persona).png`;
     if (overwriteName in power_user.personas) {
         const confirmationconfirm = await callPopupPopup.show.confirm('Overwrite Existing Persona', 'This character exists as a persona already. AreDo you sure want to overwrite it?', 'confirm', '', { okButton: 'Yes' });
+-
 +        if (!confirm) {
 -        if (confirmation === false) {
             console.log('User cancelled the overwrite of the persona');
             return;
+        }
+    }
     if (description.includes('{{char}}') || description.includes('{{user}}')) {
 -        await delay(500);
 +        const confirm = await Popup.show.confirm('Persona Description Macros', 'This character has a description that uses <code>{{char}}</code> or <code>{{user}}</code> macros. Do you want to swap them in the persona description?');
 -        const confirmation = await callPopup('This character has a description that uses {{char}} or {{user}} macros. Do you want to swap them in the persona description?', 'confirm', '', { okButton: 'Yes' });
 +        if (confirm) {
+-
 -        if (confirmation) {
             description = description.replace(/{{char}}/gi, '{{personaChar}}').replace(/{{user}}/gi, '{{personaUser}}');
             description = description.replace(/{{personaUser}}/gi, '{{char}}').replace(/{{personaChar}}/gi, '{{user}}');
+        }

public/scripts/templates/scenarioOverride.html+17 -0 Viewed

 +<div class="scenario_override range-block flexFlowColumn flex-container">
 +    <div class="range-block-title title_restorable">
 +        <h3><span data-i18n="Chat Scenario Override" class="margin0">Chat Scenario Override</span></h3>
 +        <div title="Remove" data-i18n="[title]Remove"
 +            class="menu_button fa-solid fa-trash-can remove_scenario_override"></div>
 +    </div>
 +    <div class="range-block-counter justifyLeft flex-container flexFlowColumn">
 +        <strong>Unique to this chat.</strong>
 +        <span data-group="true">All group members will use the following scenario text instead of what is specified in their character cards.</span>
 +        <span data-character="true">The following scenario text will be used instead of the value set in the character card.</span>
 +        Checkpoints inherit the scenario override from their parent, and can be changed individually after that.
 +    </div>
 +    <div class="range-block-range wide100p">
 +        <textarea class="wide100p chat_scenario" class="text_pole" rows="15" data-i18n="[placeholder]Type here..."
 +            placeholder="Type here..."></textarea>
 +    </div>
 +</div>