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 vectors

Browse Source
This commit is contained in:
Cohee
2023-09-10 02:42:42 +03:00
parent 23951b8c8a 3dbdd1258e
commit f8d90c1933
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/script.js
View File

@ -3418,7 +3418,7 @@ function parseTokenCounts(counts, thisPromptBits) {
function addChatsPreamble(mesSendString) {
return main_api === 'novel'
? nai_settings.preamble + '\n' + mesSendString
? substituteParams(nai_settings.preamble) + '\n' + mesSendString
: mesSendString;
}
@ -8478,6 +8478,7 @@ jQuery(async function () {
'#world_popup',
'.ui-widget',
'.text_pole',
'#toast-container',
];
for (const id of forbiddenTargets) {
if (clickTarget.closest(id).length > 0) {