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

Fix group join prefix/suffix controls state on render

This commit is contained in:
Wolfsblvt 2024-04-08 00:34:21 +02:00
parent f4fcbff17e
commit 40b3640fa2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/scripts/group-chats.js
View File

@ -1119,9 +1119,7 @@ async function onGroupGenerationModeInput(e) {
_thisGroup.generation_mode = Number(e.target.value); _thisGroup.generation_mode = Number(e.target.value);
await editGroup(openGroupId, false, false); await editGroup(openGroupId, false, false);
const isJoin = [group_generation_mode.APPEND, group_generation_mode.APPEND_DISABLED].includes(_thisGroup.generation_mode); toggleHiddenControls(_thisGroup);
$('#rm_group_generation_mode_join_prefix').parent().toggle(isJoin);
$('#rm_group_generation_mode_join_suffix').parent().toggle(isJoin);
} }
} }
@ -1308,6 +1306,12 @@ async function onHideMutedSpritesClick(value) {
} }
} }
function toggleHiddenControls(group, generationMode = null) {
const isJoin = [group_generation_mode.APPEND, group_generation_mode.APPEND_DISABLED].includes(generationMode ?? group?.generation_mode);
$('#rm_group_generation_mode_join_prefix').parent().toggle(isJoin);
$('#rm_group_generation_mode_join_suffix').parent().toggle(isJoin);
}
function select_group_chats(groupId, skipAnimation) { function select_group_chats(groupId, skipAnimation) {
openGroupId = groupId; openGroupId = groupId;
newGroupMembers = []; newGroupMembers = [];
@ -1343,8 +1347,9 @@ function select_group_chats(groupId, skipAnimation) {
$('#rm_group_hidemutedsprites').prop('checked', group && group.hideMutedSprites); $('#rm_group_hidemutedsprites').prop('checked', group && group.hideMutedSprites);
$('#rm_group_automode_delay').val(group?.auto_mode_delay ?? DEFAULT_AUTO_MODE_DELAY); $('#rm_group_automode_delay').val(group?.auto_mode_delay ?? DEFAULT_AUTO_MODE_DELAY);
$('#rm_group_generation_mode_join_prefix').val(group?.generation_mode_join_prefix).attr('setting', 'generation_mode_join_prefix'); $('#rm_group_generation_mode_join_prefix').val(group?.generation_mode_join_prefix ?? '').attr('setting', 'generation_mode_join_prefix');
$('#rm_group_generation_mode_join_suffix').val(group?.generation_mode_join_suffix).attr('setting', 'generation_mode_join_suffix'); $('#rm_group_generation_mode_join_suffix').val(group?.generation_mode_join_suffix ?? '').attr('setting', 'generation_mode_join_suffix');
toggleHiddenControls(group, generationMode);
// bottom buttons // bottom buttons
if (openGroupId) { if (openGroupId) {
@ -1379,6 +1384,11 @@ function select_group_chats(groupId, skipAnimation) {
$('#rm_group_automode_label').hide(); $('#rm_group_automode_label').hide();
} }
// Toggle textbox sizes, as input events have not fired here
$('#rm_group_chats_block .autoSetHeight').each(element => {
resetScrollHeight(element);
});
eventSource.emit('groupSelected', { detail: { id: openGroupId, group: group } }); eventSource.emit('groupSelected', { detail: { id: openGroupId, group: group } });
} }