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 parser-v2

Browse Source
This commit is contained in:
LenAnderson
2024-04-11 22:24:10 -04:00
parent f95e38e85a 626c93a1ab
commit 35634415c2
26 changed files with 1178 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/scripts/slash-commands.js
View File

@ -52,6 +52,7 @@ import { textgen_types, textgenerationwebui_settings } from './textgen-settings.
import { decodeTextTokens, getFriendlyTokenizerName, getTextTokens, getTokenCount } from './tokenizers.js';
import { debounce, delay, escapeRegex, isFalseBoolean, isTrueBoolean, stringToRange, trimToEndSentence, trimToStartSentence, waitUntilCondition } from './utils.js';
import { registerVariableCommands, resolveVariable } from './variables.js';
import { background_settings } from './backgrounds.js';
import { SlashCommandScope } from './slash-commands/SlashCommandScope.js';
import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';
import { SlashCommandClosureResult } from './slash-commands/SlashCommandClosureResult.js';
@ -1629,7 +1630,9 @@ $(document).on('click', '[data-displayHelp]', function (e) {
function setBackgroundCallback(_, bg) {
if (!bg) {
return;
// allow reporting of the background name if called without args
// for use in ST Scripts via pipe
return background_settings.name;
}
console.log('Set background to ' + bg);