Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging

This commit is contained in:
Cohee
2023-08-25 20:34:33 +03:00
5 changed files with 25 additions and 16 deletions

View File

@ -373,6 +373,9 @@ const system_message_types = {
};
const extension_prompt_types = {
/**
* @deprecated Outdated term. In reality it's "after main prompt or story string"
*/
AFTER_SCENARIO: 0,
IN_CHAT: 1
};
@ -2257,8 +2260,8 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
return;
}
// Hide swipes on either multigen or real streaming
if ((isStreamingEnabled() || isMultigenEnabled()) && !dryRun) {
// Hide swipes if not in a dry run.
if (!dryRun) {
hideSwipeButtons();
}