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

Update delete message to new popup

This commit is contained in:
Wolfsblvt 2024-06-26 03:36:06 +02:00
parent 0c402e2a5f
commit c8411b6dfb
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/css/popup.css
View File

@ -115,12 +115,10 @@ dialog {
background-color: var(--crimson-hover); background-color: var(--crimson-hover);
} }
.menu_button.popup-button-custom {
/* Custom buttons should not scale to smallest size, otherwise they will always break to multiline */
width: unset;
}
.popup-controls .menu_button { .popup-controls .menu_button {
/* Popup buttons should not scale to smallest size, otherwise they will always break to multiline if multiple words */
width: unset;
/* Fix weird animation issue with fonts on brightness filter */ /* Fix weird animation issue with fonts on brightness filter */
backface-visibility: hidden; backface-visibility: hidden;
transform: translateZ(0); transform: translateZ(0);

34
public/script.js
View File

@ -228,7 +228,7 @@ import { appendFileContent, hasPendingFileAttachment, populateFileAttachment, de
import { initPresetManager } from './scripts/preset-manager.js'; import { initPresetManager } from './scripts/preset-manager.js';
import { evaluateMacros } from './scripts/macros.js'; import { evaluateMacros } from './scripts/macros.js';
import { currentUser, setUserControls } from './scripts/user.js'; import { currentUser, setUserControls } from './scripts/user.js';
import { POPUP_TYPE, Popup, callGenericPopup, fixToastrForDialogs } from './scripts/popup.js'; import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup, fixToastrForDialogs } from './scripts/popup.js';
import { renderTemplate, renderTemplateAsync } from './scripts/templates.js'; import { renderTemplate, renderTemplateAsync } from './scripts/templates.js';
import { ScraperManager } from './scripts/scrapers.js'; import { ScraperManager } from './scripts/scrapers.js';
import { SlashCommandParser } from './scripts/slash-commands/SlashCommandParser.js'; import { SlashCommandParser } from './scripts/slash-commands/SlashCommandParser.js';
@ -10085,26 +10085,32 @@ jQuery(async function () {
$(document).on('click', '.mes_edit_delete', async function (event, customData) { $(document).on('click', '.mes_edit_delete', async function (event, customData) {
const fromSlashCommand = customData?.fromSlashCommand || false; const fromSlashCommand = customData?.fromSlashCommand || false;
const swipeExists = (!Array.isArray(chat[this_edit_mes_id].swipes) || chat[this_edit_mes_id].swipes.length <= 1 || chat[this_edit_mes_id].is_user || parseInt(this_edit_mes_id) !== chat.length - 1); const canDeleteSwipe = (Array.isArray(chat[this_edit_mes_id].swipes) && chat[this_edit_mes_id].swipes.length > 1 && !chat[this_edit_mes_id].is_user && parseInt(this_edit_mes_id) === chat.length - 1);
let deleteOnlySwipe = false;
if (power_user.confirm_message_delete && fromSlashCommand !== true) { if (power_user.confirm_message_delete && fromSlashCommand !== true) {
const confirmation = swipeExists ? await callPopup('Are you sure you want to delete this message?', 'confirm') const result = await callGenericPopup('Are you sure you want to delete this?', POPUP_TYPE.CONFIRM, null, {
: await callPopup('<h3>Delete this...</h3> <select id=\'del_type\'><option value=\'swipe\'>Swipe</option><option value=\'message\'>Message</option></select>', 'confirm'); okButton: canDeleteSwipe ? 'Delete Swipe' : 'Delete Message',
if (!confirmation) { cancelButton: 'Cancel',
customButtons: canDeleteSwipe ? ['Delete Message'] : null,
});
if (!result) {
return; return;
} }
deleteOnlySwipe = canDeleteSwipe && result === 1; // Default button, not the custom one
} }
const mes = $(this).closest('.mes'); const messageElement = $(this).closest('.mes');
if (!messageElement) {
if (!mes) {
return; return;
} }
if ($('#del_type').val() === 'swipe') { if (deleteOnlySwipe) {
const swipe_id = chat[this_edit_mes_id]['swipe_id']; const message = chat[this_edit_mes_id];
chat[this_edit_mes_id]['swipes'].splice(swipe_id, 1); const swipe_id = message.swipe_id;
if (Array.isArray(chat[this_edit_mes_id]['swipe_info']) && chat[this_edit_mes_id]['swipe_info'].length) { message.swipes.splice(swipe_id, 1);
chat[this_edit_mes_id].swipe_info.splice(swipe_id, 1); if (Array.isArray(message.swipe_info) && message.swipe_info.length) {
message.swipe_info.splice(swipe_id, 1);
} }
if (swipe_id > 0) { if (swipe_id > 0) {
$('.swipe_left:last').click(); $('.swipe_left:last').click();
@ -10113,7 +10119,7 @@ jQuery(async function () {
} }
} else { } else {
chat.splice(this_edit_mes_id, 1); chat.splice(this_edit_mes_id, 1);
mes.remove(); messageElement.remove();
} }
let startFromZero = Number(this_edit_mes_id) === 0; let startFromZero = Number(this_edit_mes_id) === 0;