rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix characters list corruption

Browse Source
This commit is contained in:
SillyLossy
2023-05-20 00:14:02 +03:00
parent 933e5af58f
commit 8889e5546e
1 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
public/script.js
View File

@ -227,7 +227,6 @@ let safetychat = [
]; ];
let chat_create_date = 0; let chat_create_date = 0;
let prev_selected_char = null;
const default_ch_mes = "Hello"; const default_ch_mes = "Hello";
let count_view_mes = 0; let count_view_mes = 0;
let mesStr = ""; let mesStr = "";
@ -4105,8 +4104,7 @@ function setRightTabSelectedClass(selectedButtonId) {
}); });
} }
function select_rm_info(type, charId) { function select_rm_info(type, charId, previousCharId = null) {
if (!type) { if (!type) {
toastr.error(`Invalid process (no 'type')`); toastr.error(`Invalid process (no 'type')`);
return; return;
@ -4137,10 +4135,8 @@ function select_rm_info(type, charId) {
setRightTabSelectedClass(); setRightTabSelectedClass();
prev_selected_char = charId; if (previousCharId) {
const newId = characters.findIndex((x) => x.avatar == previousCharId);
if (prev_selected_char) {
const newId = characters.findIndex((x) => x.name == prev_selected_char);
if (newId >= 0) { if (newId >= 0) {
this_chid = newId; this_chid = newId;
} }
@ -4247,21 +4243,11 @@ function select_rm_create() {
} }
function select_rm_characters() { function select_rm_characters() {
restoreSelectedCharacter();
menu_type = "characters"; menu_type = "characters";
selectRightMenuWithAnimation('rm_characters_block'); selectRightMenuWithAnimation('rm_characters_block');
setRightTabSelectedClass('rm_button_characters'); setRightTabSelectedClass('rm_button_characters');
} }
function restoreSelectedCharacter() {
if (prev_selected_char) {
let newChId = characters.findIndex((x) => x.name == prev_selected_char);
$(`.character_select[chid="${newChId}"]`).trigger("click");
prev_selected_char = null;
}
}
function setExtensionPrompt(key, value, position, depth) { function setExtensionPrompt(key, value, position, depth) {
extension_prompts[key] = { value, position, depth }; extension_prompts[key] = { value, position, depth };
} }
@ -5392,7 +5378,7 @@ $(document).ready(function () {
$("#create_button").attr("value", "✅"); $("#create_button").attr("value", "✅");
let oldSelectedChar = null; let oldSelectedChar = null;
if (this_chid != undefined && this_chid != "invalid-safety-id") { if (this_chid != undefined && this_chid != "invalid-safety-id") {
oldSelectedChar = characters[this_chid].name; oldSelectedChar = characters[this_chid].avatar;
} }
console.log(`new avatar id: ${html}`); console.log(`new avatar id: ${html}`);
@ -5402,7 +5388,7 @@ $(document).ready(function () {
$("#rm_info_block").transition({ opacity: 0, duration: 0 }); $("#rm_info_block").transition({ opacity: 0, duration: 0 });
var $prev_img = $("#avatar_div_div").clone(); var $prev_img = $("#avatar_div_div").clone();
$("#rm_info_avatar").append($prev_img); $("#rm_info_avatar").append($prev_img);
select_rm_info(`char_create`, save_name); select_rm_info(`char_create`, save_name, oldSelectedChar);
$("#rm_info_block").transition({ opacity: 1.0, duration: 2000 }); $("#rm_info_block").transition({ opacity: 1.0, duration: 2000 });
crop_data = undefined; crop_data = undefined;
@ -6226,8 +6212,6 @@ $(document).ready(function () {
return; return;
} }
let names = [];
for (const file of e.target.files) { for (const file of e.target.files) {
var ext = file.name.match(/\.(\w+)$/); var ext = file.name.match(/\.(\w+)$/);
if ( if (
@ -6264,13 +6248,11 @@ $(document).ready(function () {
let oldSelectedChar = null; let oldSelectedChar = null;
if (this_chid != undefined && this_chid != "invalid-safety-id") { if (this_chid != undefined && this_chid != "invalid-safety-id") {
oldSelectedChar = characters[this_chid].name; oldSelectedChar = characters[this_chid].avatar;
} }
names.push(data.file_name);
let nameString = DOMPurify.sanitize(names.join(', '));
await getCharacters(); await getCharacters();
select_rm_info(`char_import`, data.file_name); select_rm_info(`char_import`, data.file_name, oldSelectedChar);
$("#rm_info_block").transition({ opacity: 1, duration: 1000 }); $("#rm_info_block").transition({ opacity: 1, duration: 1000 });
} }
}, },