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 double rendering of first message when opening a chat with only 1 message

Browse Source
This commit is contained in:
Cohee
2024-03-16 18:22:33 +02:00
parent 2173b8b22a
commit 3ed7ccbc57
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/script.js
View File

@@ -8328,7 +8328,15 @@ jQuery(async function () {
} }
}); });
$(document).on('click', '#user_avatar_block .avatar-container', setUserAvatar); $(document).on('click', '#user_avatar_block .avatar-container', function () {
const imgfile = $(this).attr('imgfile');
setUserAvatar(imgfile);
// force firstMes {{user}} update on persona switch
if (this_chid >= 0 && !selected_group && chat.length === 1) {
$('#firstmessage_textarea').trigger('input');
}
});
$(document).on('click', '#user_avatar_block .avatar_upload', function () { $(document).on('click', '#user_avatar_block .avatar_upload', function () {
$('#avatar_upload_overwrite').val(''); $('#avatar_upload_overwrite').val('');
$('#avatar_upload_file').trigger('click'); $('#avatar_upload_file').trigger('click');

7
public/scripts/personas.js
View File

@@ -16,7 +16,6 @@ import {
this_chid, this_chid,
user_avatar, user_avatar,
} from '../script.js'; } from '../script.js';
import { getContext } from './extensions.js';
import { persona_description_positions, power_user } from './power-user.js'; import { persona_description_positions, power_user } from './power-user.js';
import { getTokenCount } from './tokenizers.js'; import { getTokenCount } from './tokenizers.js';
import { debounce, delay, download, parseJsonFile } from './utils.js'; import { debounce, delay, download, parseJsonFile } from './utils.js';
@@ -296,12 +295,6 @@ export function selectCurrentPersona() {
} }
setPersonaDescription(); setPersonaDescription();
// force firstMes {{user}} update on persona switch
const context = getContext();
if (context.characterId >= 0 && !context.groupId && context.chat.length === 1) {
$('#firstmessage_textarea').trigger('input');
}
} }
} }