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

Merge branch 'staging' into tag-slash-commands

Browse Source
This commit is contained in:
Cohee
2024-05-18 17:27:04 +03:00
parent 2bde9d2b15 0653dad5c5
commit 38e2bf955c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/preset-manager.js
View File

@@ -114,7 +114,9 @@ class PresetManager {
* @returns {any} Preset value * @returns {any} Preset value
*/ */
findPreset(name) { findPreset(name) {
return $(this.select).find(`option:contains(${name})`).val(); return $(this.select).find('option').filter(function() {
return $(this).text() === name;
}).val();
} }
/** /**

5
public/scripts/tags.js
View File

@@ -1047,7 +1047,7 @@ function onGroupCreateClick() {
export function applyTagsOnCharacterSelect() { export function applyTagsOnCharacterSelect() {
//clearTagsFilter(); //clearTagsFilter();
const chid = Number($(this).attr('chid')); const chid = Number(this_chid);
printTagList($('#tagList'), { forEntityOrKey: chid, tagOptions: { removable: true } }); printTagList($('#tagList'), { forEntityOrKey: chid, tagOptions: { removable: true } });
} }
@@ -1698,8 +1698,6 @@ export function initTags() {
$(document).on('click', '#rm_button_create', onCharacterCreateClick); $(document).on('click', '#rm_button_create', onCharacterCreateClick);
$(document).on('click', '#rm_button_group_chats', onGroupCreateClick); $(document).on('click', '#rm_button_group_chats', onGroupCreateClick);
$(document).on('click', '.character_select', applyTagsOnCharacterSelect);
$(document).on('click', '.group_select', applyTagsOnGroupSelect);
$(document).on('click', '.tag_remove', onTagRemoveClick); $(document).on('click', '.tag_remove', onTagRemoveClick);
$(document).on('input', '.tag_input', onTagInput); $(document).on('input', '.tag_input', onTagInput);
$(document).on('click', '.tags_view', onViewTagsListClick); $(document).on('click', '.tags_view', onViewTagsListClick);
@@ -1710,6 +1708,7 @@ export function initTags() {
$(document).on('click', '.tag_view_backup', onTagsBackupClick); $(document).on('click', '.tag_view_backup', onTagsBackupClick);
$(document).on('click', '.tag_view_restore', onBackupRestoreClick); $(document).on('click', '.tag_view_restore', onBackupRestoreClick);
eventSource.on(event_types.CHARACTER_DUPLICATED, copyTags); eventSource.on(event_types.CHARACTER_DUPLICATED, copyTags);
eventSource.makeFirst(event_types.CHAT_CHANGED, () => selected_group ? applyTagsOnGroupSelect() : applyTagsOnCharacterSelect());
$(document).on('input', '#dialogue_popup input[name="auto_sort_tags"]', (evt) => { $(document).on('input', '#dialogue_popup input[name="auto_sort_tags"]', (evt) => {
const toggle = $(evt.target).is(':checked'); const toggle = $(evt.target).is(':checked');