Merge pull request #2580 from SillyTavern/staging Staging

eac2e3d81e128c61299c94ef6c9dd1a8fd87a8c1

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
Parents: 968133dee9409f4a1bcadff5caff9686834b0313 7ccc98803c767cbec5d540b24b252c002c47c67a
12 files changed, +127 -167Ignore whitespace
public/css/extensions-panel.css+2 -1
@@ -7,7 +7,8 @@
77 background-color: green;
88}
99
1010.extensions_block input[type="checkbox"] {,
11+.extensions_block input[type="radio"] {
1112 margin-left: 10px;
1213 margin-right: 10px;
1314}
public/css/tags.css+6 -6
@@ -209,20 +209,20 @@
209209 opacity: 1;
210210}
211211
212212.tag_as_folder.right_menu_button {
213213 filter: brightness(75%) saturate(0.6);
214214}
215215
216216.tag_as_folder.right_menu_button:hover,
217217.tag_as_folder.right_menu_button.flash {
218218 filter: brightness(150%) saturate(0.6) !important;
219219}
220220
221221.tag_as_folder.right_menu_button.no_folder {
222222 filter: brightness(25%) saturate(0.25);
223223}
224224
225225.tag_as_folder.right_menu_button .tag_folder_indicator {
226226 position: absolute;
227227 top: calc(var(--mainFontSize) * -0.5);
228228 right: calc(var(--mainFontSize) * -0.5);
public/index.html+1 -1
@@ -4026,7 +4026,7 @@
40264026 <input type="range" id="smooth_streaming_speed" name="smooth_streaming_speed" min="0" max="100" step="10" value="50">
40274027 <div class="slider_hint">
40284028 <span data-i18n="Slow">Slow</span>
40294029 <span data-i18n=""></span>
40304030 <span data-i18n="Fast">Fast</span>
40314031 </div>
40324032 </div>
public/locales/zh-cn.json+17 -3
@@ -217,9 +217,11 @@
217217 "Character Names Behavior": "角色名称行为",
218218 "Helps the model to associate messages with characters.": "有助于模型将消息与角色关联起来。",
219219 "None": "无",
220+ "character_names_none": "不添加角色名称前缀。在群聊中可能导致错误行为，谨慎勾选。",
221+ "Never add character names.": "不添加角色名称。",
220222 "character_names_default": "群聊和过去的角色除外。否则，请确保在提示词中提供了姓名。",
221223 "Don't add character names unless necessary.": "不添加角色名称如非必要，否则不添加角色名称。",
222224 "Completion Object": "补全对象",
223225 "character_names_completion": "适用限制：仅限拉丁字母数字和下划线。不适用于所有补全源，尤其是：Claude、MistralAI、Google。",
224226 "Add character names to completion objects.": "在补全对象中添加角色名称。",
225227 "Message Content": "消息内容",
@@ -489,6 +491,10 @@
489491 "First Assistant Prefix": "第一个助理前缀",
490492 "instruct_last_output_sequence": "插入到最后一条助手消息之前或作为生成 AI 回复时的最后一行提示词（中立/系统角色除外）。",
491493 "Last Assistant Prefix": "最后一个助理前缀",
494+ "Inserted before the first User's message.": "插入在第一个用户的消息之前。",
495+ "First User Prefix": "第一个用户前缀",
496+ "instruct_last_input_sequence": "插入到最后一条用户消息之前。",
497+ "Last User Prefix": "上次用户前缀",
492498 "Will be inserted as a last prompt line when using system/neutral generation.": "当使用系统/中性生成时将作为最后的一行提示词插入。",
493499 "System Instruction Prefix": "系统指令前缀",
494500 "If a stop sequence is generated, everything past it will be removed from the output (inclusive).": "如果生成了停止序列，则该序列之后的所有内容都将从输出中删除（包括在内）。",
@@ -555,7 +561,7 @@
555561 "Close all Entries": "关闭所有条目",
556562 "New Entry": "新条目",
557563 "Fill empty Memo/Titles with Keywords": "使用关键字填充空的备忘录/标题",
558564 "Apply customcurrent sorting as Order": "应用自定义排序作为顺序应用当前排序作为顺序",
559565 "Import World Info": "导入世界书",
560566 "Export World Info": "导出世界书",
561567 "Duplicate World Info": "复制世界书",
@@ -1187,6 +1193,7 @@
11871193 "Bind user name to that avatar": "将用户名称绑定到该头像",
11881194 "Change persona image": "更改用户角色头像",
11891195 "Select this as default persona for the new chats.": "选择此项作为新聊天的默认用户角色。",
1196+ "Duplicate persona": "复制用户角色",
11901197 "Delete persona": "删除用户角色",
11911198 "These characters are the winners of character design contests and have outstandable quality.": "这些角色都是角色设计大赛的获奖者，品质非常出色。",
11921199 "Contest Winners": "比赛获胜者",
@@ -1327,6 +1334,10 @@
13271334 "ext_sum_injection_template": "插入模板",
13281335 "ext_sum_memory_template_placeholder": "{{summary}} 将解析当前摘要内容。",
13291336 "ext_sum_injection_position": "插入位置",
1337+ "ext_sum_include_wi_scan_desc": "在 WI 扫描中包括最新摘要。",
1338+ "ext_sum_include_wi_scan": "纳入世界信息扫描",
1339+ "None (not injected)": "无（未注入）",
1340+ "ext_sum_injection_position_none": "摘要不会被注入到提示中。您仍然可以通过 {{summary}} 宏访问它。",
13301341 "How many messages before the current end of the chat.": "当前聊天结束前还有多少条消息。",
13311342 "Labels and Message": "标签和信息",
13321343 "Label": "标签",
@@ -1757,6 +1768,8 @@
17571768 "help_macros_56": "指示系统指令前缀",
17581769 "help_macros_57": "指示第一个用户消息填充器",
17591770 "help_macros_58": "指示停止顺序",
1771+ "help_macros_first_user": "指示用户第一个输入序列",
1772+ "help_macros_last_user": "指示用户最后输入序列",
17601773 "Chat variables Macros:": "聊天变量宏：",
17611774 "Local variables = unique to the current chat": "局部变量 = 当前聊天所独有",
17621775 "Global variables = works in any chat for any character": "全局变量 = 适用于任何角色的任何聊天",
@@ -1794,6 +1807,7 @@
17941807 "Record a snapshot of your current settings.": "记录当前设置的快照。",
17951808 "Make a Snapshot": "制作快照",
17961809 "Restore this snapshot": "恢复此快照",
1810+ "Download Model": "下载模型",
17971811 "Downloader Options": "下载器选项",
17981812 "Extra parameters for downloading/HuggingFace API": "下载/HuggingFace API 的额外参数。如果不确定，请将其留空。",
17991813 "Revision": "修订",
public/script.js+30 -120
@@ -570,6 +570,7 @@ export const system_message_types = {
570570 * @enum {number} Extension prompt types
571571 */
572572export const extension_prompt_types = {
573+ NONE: -1,
573574 IN_PROMPT: 0,
574575 IN_CHAT: 1,
575576 BEFORE_PROMPT: 2,
@@ -929,10 +930,17 @@ async function firstLoadInit() {
929930 initCfg();
930931 initLogprobs();
931932 doDailyExtensionUpdatesCheck();
932933 await hideLoader();
934+ await fixViewport();
933935 await eventSource.emit(event_types.APP_READY);
934936}
935937
938+async function fixViewport() {
939+ document.body.style.position = 'absolute';
940+ await delay(1);
941+ document.body.style.position = '';
942+}
943+
936944function cancelStatusCheck() {
937945 abortStatusCheck?.abort();
938946 abortStatusCheck = new AbortController();
@@ -8302,6 +8310,7 @@ const swipe_right = () => {
83028310};
83038311
83048312const CONNECT_API_MAP = {
8313+ // Default APIs not contined inside text gen / chat gen
83058314 'kobold': {
83068315 selected: 'kobold',
83078316 button: '#api_button',
@@ -8313,147 +8322,48 @@ const CONNECT_API_MAP = {
83138322 selected: 'novel',
83148323 button: '#api_button_novel',
83158324 },
8316- 'ooba': {
8325+ // KoboldCpp alias
8317- selected: 'textgenerationwebui',
8318- button: '#api_button_textgenerationwebui',
8319- type: textgen_types.OOBA,
8320- },
8321- 'tabby': {
8322- selected: 'textgenerationwebui',
8323- button: '#api_button_textgenerationwebui',
8324- type: textgen_types.TABBY,
8325- },
8326- 'llamacpp': {
8327- selected: 'textgenerationwebui',
8328- button: '#api_button_textgenerationwebui',
8329- type: textgen_types.LLAMACPP,
8330- },
8331- 'ollama': {
8332- selected: 'textgenerationwebui',
8333- button: '#api_button_textgenerationwebui',
8334- type: textgen_types.OLLAMA,
8335- },
8336- 'mancer': {
8337- selected: 'textgenerationwebui',
8338- button: '#api_button_textgenerationwebui',
8339- type: textgen_types.MANCER,
8340- },
8341- 'vllm': {
8342- selected: 'textgenerationwebui',
8343- button: '#api_button_textgenerationwebui',
8344- type: textgen_types.VLLM,
8345- },
8346- 'aphrodite': {
8347- selected: 'textgenerationwebui',
8348- button: '#api_button_textgenerationwebui',
8349- type: textgen_types.APHRODITE,
8350- },
8351- 'koboldcpp': {
8352- selected: 'textgenerationwebui',
8353- button: '#api_button_textgenerationwebui',
8354- type: textgen_types.KOBOLDCPP,
8355- },
83568326 'kcpp': {
83578327 selected: 'textgenerationwebui',
83588328 button: '#api_button_textgenerationwebui',
83598329 type: textgen_types.KOBOLDCPP,
83608330 },
8361- 'togetherai': {
8331+ // OpenAI alias
8362- selected: 'textgenerationwebui',
8363- button: '#api_button_textgenerationwebui',
8364- type: textgen_types.TOGETHERAI,
8365- },
8366- 'openai': {
8367- selected: 'openai',
8368- button: '#api_button_openai',
8369- source: chat_completion_sources.OPENAI,
8370- },
83718332 'oai': {
83728333 selected: 'openai',
83738334 button: '#api_button_openai',
83748335 source: chat_completion_sources.OPENAI,
83758336 },
8376- 'claude': {
8337+ // OpenRouter special naming, to differentiate between chat comp and text comp
8377- selected: 'openai',
8378- button: '#api_button_openai',
8379- source: chat_completion_sources.CLAUDE,
8380- },
8381- 'windowai': {
8382- selected: 'openai',
8383- button: '#api_button_openai',
8384- source: chat_completion_sources.WINDOWAI,
8385- },
83868338 'openrouter': {
83878339 selected: 'openai',
83888340 button: '#api_button_openai',
83898341 source: chat_completion_sources.OPENROUTER,
83908342 },
8391- 'scale': {
8392- selected: 'openai',
8393- button: '#api_button_openai',
8394- source: chat_completion_sources.SCALE,
8395- },
8396- 'ai21': {
8397- selected: 'openai',
8398- button: '#api_button_openai',
8399- source: chat_completion_sources.AI21,
8400- },
8401- 'makersuite': {
8402- selected: 'openai',
8403- button: '#api_button_openai',
8404- source: chat_completion_sources.MAKERSUITE,
8405- },
8406- 'mistralai': {
8407- selected: 'openai',
8408- button: '#api_button_openai',
8409- source: chat_completion_sources.MISTRALAI,
8410- },
8411- 'custom': {
8412- selected: 'openai',
8413- button: '#api_button_openai',
8414- source: chat_completion_sources.CUSTOM,
8415- },
8416- 'cohere': {
8417- selected: 'openai',
8418- button: '#api_button_openai',
8419- source: chat_completion_sources.COHERE,
8420- },
8421- 'perplexity': {
8422- selected: 'openai',
8423- button: '#api_button_openai',
8424- source: chat_completion_sources.PERPLEXITY,
8425- },
8426- 'groq': {
8427- selected: 'openai',
8428- button: '#api_button_openai',
8429- source: chat_completion_sources.GROQ,
8430- },
8431- '01ai': {
8432- selected: 'openai',
8433- button: '#api_button_openai',
8434- source: chat_completion_sources.ZEROONEAI,
8435- },
8436- 'infermaticai': {
8437- selected: 'textgenerationwebui',
8438- button: '#api_button_textgenerationwebui',
8439- type: textgen_types.INFERMATICAI,
8440- },
8441- 'dreamgen': {
8442- selected: 'textgenerationwebui',
8443- button: '#api_button_textgenerationwebui',
8444- type: textgen_types.DREAMGEN,
8445- },
84468343 'openrouter-text': {
84478344 selected: 'textgenerationwebui',
84488345 button: '#api_button_textgenerationwebui',
84498346 type: textgen_types.OPENROUTER,
84508347 },
8451- 'huggingface': {
8348+};
8349+
8350+// Fill connections map from textgen_types and chat_completion_sources
8351+for (const textGenType of Object.values(textgen_types)) {
8352+ if (CONNECT_API_MAP[textGenType]) continue;
8353+ CONNECT_API_MAP[textGenType] = {
84528354 selected: 'textgenerationwebui',
84538355 button: '#api_button_textgenerationwebui',
84548356 type: textgen_types.HUGGINGFACEtextGenType,
84558357 },;
84568358};
8359+for (const chatCompletionSource of Object.values(chat_completion_sources)) {
8360+ if (CONNECT_API_MAP[chatCompletionSource]) continue;
8361+ CONNECT_API_MAP[chatCompletionSource] = {
8362+ selected: 'openai',
8363+ button: '#api_button_openai',
8364+ source: chatCompletionSource,
8365+ };
8366+}
84578367
84588368async function selectContextCallback(_, name) {
84598369 if (!name) {
public/scripts/extensions/memory/index.js+13 -2
@@ -14,6 +14,7 @@ import {
1414 substituteParamsExtended,
1515 generateRaw,
1616 getMaxContextSize,
17+ setExtensionPrompt,
1718} from '../../../script.js';
1819import { is_group_generating, selected_group } from '../../group-chats.js';
1920import { loadMovingUIState } from '../../power-user.js';
@@ -73,6 +74,7 @@ const defaultSettings = {
7374 template: defaultTemplate,
7475 position: extension_prompt_types.IN_PROMPT,
7576 role: extension_prompt_roles.SYSTEM,
77+ scan: false,
7678 depth: 2,
7779 promptWords: 200,
7880 promptMinWords: 25,
@@ -122,6 +124,7 @@ function loadSettings() {
122124 $(`input[name="memory_prompt_builder"][value="${extension_settings.memory.prompt_builder}"]`).prop('checked', true).trigger('input');
123125 $('#memory_override_response_length').val(extension_settings.memory.overrideResponseLength).trigger('input');
124126 $('#memory_max_messages_per_request').val(extension_settings.memory.maxMessagesPerRequest).trigger('input');
127+ $('#memory_include_wi_scan').prop('checked', extension_settings.memory.scan).trigger('input');
125128 switchSourceControls(extension_settings.memory.source);
126129}
127130
@@ -279,6 +282,13 @@ function onMemoryPositionChange(e) {
279282 saveSettingsDebounced();
280283}
281284
285+function onMemoryIncludeWIScanInput() {
286+ const value = !!$(this).prop('checked');
287+ extension_settings.memory.scan = value;
288+ reinsertMemory();
289+ saveSettingsDebounced();
290+}
291+
282292function onMemoryPromptWordsForceInput() {
283293 const value = $(this).val();
284294 extension_settings.memory.promptForceWords = Number(value);
@@ -800,8 +810,7 @@ function reinsertMemory() {
800810 * @param {number|null} index Index of the chat message to save the summary to. If null, the pre-last message is used.
801811 */
802812function setMemoryContext(value, saveToMessage, index = null) {
803- const context = getContext();
813+ setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, extension_settings.memory.scan, extension_settings.memory.role);
804- context.setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, false, extension_settings.memory.role);
805814 $('#memory_contents').val(value);
806815
807816 const summaryLog = value
@@ -809,6 +818,7 @@ function setMemoryContext(value, saveToMessage, index = null) {
809818 : 'Summary has no content';
810819 console.debug(summaryLog);
811820
821+ const context = getContext();
812822 if (saveToMessage && context.chat.length) {
813823 const idx = index ?? context.chat.length - 2;
814824 const mes = context.chat[idx < 0 ? 0 : idx];
@@ -894,6 +904,7 @@ function setupListeners() {
894904 $('#memory_prompt_words_auto').off('click').on('click', onPromptForceWordsAutoClick);
895905 $('#memory_override_response_length').off('click').on('input', onOverrideResponseLengthInput);
896906 $('#memory_max_messages_per_request').off('click').on('input', onMaxMessagesPerRequestInput);
907+ $('#memory_include_wi_scan').off('input').on('input', onMemoryIncludeWIScanInput);
897908 $('#summarySettingsBlockToggle').off('click').on('click', function () {
898909 console.log('saw settings button click');
899910 $('#summarySettingsBlock').slideToggle(200, 'swing'); //toggleClass("hidden");
public/scripts/extensions/memory/settings.html+9 -0
@@ -109,8 +109,17 @@
109109 <textarea id="memory_template" class="text_pole textarea_compact" rows="2" data-i18n="[placeholder]ext_sum_memory_template_placeholder" placeholder="&lcub;&lcub;summary&rcub;&rcub; will resolve to the current summary contents."></textarea>
110110 </div>
111111 <label for="memory_position" data-i18n="ext_sum_injection_position">Injection Position</label>
112+ <label class="checkbox_label" for="memory_include_wi_scan" data-i18n="[title]ext_sum_include_wi_scan_desc" title="Include the latest summary in the WI scan.">
113+ <input id="memory_include_wi_scan" type="checkbox" />
114+ <span data-i18n="ext_sum_include_wi_scan">Include in World Info Scanning</span>
115+ </label>
112116 <div class="radio_group">
113117 <label>
118+ <input type="radio" name="memory_position" value="-1" />
119+ <span data-i18n="None (not injected)">None (not injected)</span>
120+ <i class="fa-solid fa-info-circle" title="The summary will not be injected into the prompt. You can still access it via the &lcub;&lcub;summary&rcub;&rcub; macro." data-i18n="[title]ext_sum_injection_position_none"></i>
121+ </label>
122+ <label>
114123 <input type="radio" name="memory_position" value="2" />
115124 <span data-i18n="Before Main Prompt / Story String">Before Main Prompt / Story String</span>
116125 </label>
public/scripts/power-user.js+30 -7
@@ -2968,7 +2968,13 @@ function setAvgBG() {
29682968 return '';
29692969}
29702970
29712971async function setThemeCallback(_, textthemeName) {
2972+ if (!themeName) {
2973+ // allow reporting of the theme name if called without args
2974+ // for use in ST Scripts via pipe
2975+ return power_user.theme;
2976+ }
2977+
29722978 // @ts-ignore
29732979 const fuse = new Fuse(themes, {
29742980 keys: [
@@ -2976,12 +2982,12 @@ async function setThemeCallback(_, text) {
29762982 ],
29772983 });
29782984
29792985 const results = fuse.search(textthemeName);
29802986 console.debug('Theme fuzzy search results for ' + textthemeName, results);
29812987 const theme = results[0]?.item;
29822988
29832989 if (!theme) {
29842990 toastr.warning(`Could not find theme with name: ${textthemeName}`);
29852991 return;
29862992 }
29872993
@@ -4056,13 +4062,30 @@ $(document).ready(() => {
40564062 callback: setThemeCallback,
40574063 unnamedArgumentList: [
40584064 SlashCommandArgument.fromProps({
40594065 description: 'theme name',
40604066 typeList: [ARGUMENT_TYPE.STRING],
4061- isRequired: true,
40624067 enumProvider: () => themes.map(theme => new SlashCommandEnumValue(theme.name)),
40634068 }),
40644069 ],
4065- helpString: 'sets a UI theme by name',
4070+ helpString: `
4071+ <div>
4072+ Sets a UI theme by name.
4073+ </div>
4074+ <div>
4075+ If no theme name is is provided, this will return the currently active theme.
4076+ </div>
4077+ <div>
4078+ <strong>Example:</strong>
4079+ <ul>
4080+ <li>
4081+ <pre><code>/theme Cappuccino</code></pre>
4082+ </li>
4083+ <li>
4084+ <pre><code>/theme</code></pre>
4085+ </li>
4086+ </ul>
4087+ </div>
4088+ `,
40664089 }));
40674090 SlashCommandParser.addCommandObject(SlashCommand.fromProps({
40684091 name: 'movingui',
public/scripts/slash-commands.js+16 -5
@@ -139,9 +139,8 @@ export function initDefaultSlashCommands() {
139139 returns: 'the current background',
140140 unnamedArgumentList: [
141141 SlashCommandArgument.fromProps({
142142 description: 'background filename',
143143 typeList: [ARGUMENT_TYPE.STRING],
144- isRequired: true,
145144 enumProvider: () => [...document.querySelectorAll('.bg_example')]
146145 .map(it => new SlashCommandEnumValue(it.getAttribute('bgfile')))
147146 .filter(it => it.value?.length),
@@ -152,11 +151,17 @@ export function initDefaultSlashCommands() {
152151 Sets a background according to the provided filename. Partial names allowed.
153152 </div>
154153 <div>
154+ If no background is provided, this will return the currently selected background.
155+ </div>
156+ <div>
155157 <strong>Example:</strong>
156158 <ul>
157159 <li>
158160 <pre><code>/bg beach.jpg</code></pre>
159161 </li>
162+ <li>
163+ <pre><code>/bg</code></pre>
164+ </li>
160165 </ul>
161166 </div>
162167 `,
@@ -1356,7 +1361,7 @@ export function initDefaultSlashCommands() {
13561361 enumProvider: commonEnumProviders.injects,
13571362 }),
13581363 new SlashCommandNamedArgument(
13591364 'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat', 'none'],
13601365 ),
13611366 new SlashCommandNamedArgument(
13621367 'depth', 'injection depth', [ARGUMENT_TYPE.NUMBER], false, false, '4',
@@ -1384,7 +1389,7 @@ export function initDefaultSlashCommands() {
13841389 'text', [ARGUMENT_TYPE.STRING], false,
13851390 ),
13861391 ],
13871392 helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries.',
13881393 }));
13891394 SlashCommandParser.addCommandObject(SlashCommand.fromProps({
13901395 name: 'listinjects',
@@ -1486,6 +1491,7 @@ function injectCallback(args, value) {
14861491 'before': extension_prompt_types.BEFORE_PROMPT,
14871492 'after': extension_prompt_types.IN_PROMPT,
14881493 'chat': extension_prompt_types.IN_CHAT,
1494+ 'none': extension_prompt_types.NONE,
14891495 };
14901496 const roles = {
14911497 'system': extension_prompt_roles.SYSTEM,
@@ -2846,7 +2852,6 @@ export async function sendMessageAs(args, text) {
28462852
28472853 if (args.name) {
28482854 name = args.name.trim();
2849- mesText = text.trim();
28502855
28512856 if (!name && !text) {
28522857 toastr.warning('You must specify a name and text to send as');
@@ -2859,8 +2864,14 @@ export async function sendMessageAs(args, text) {
28592864 localStorage.setItem(namelessWarningKey, 'true');
28602865 }
28612866 name = name2;
2867+ if (!text) {
2868+ toastr.warning('You must specify text to send as');
2869+ return '';
2870+ }
28622871 }
28632872
2873+ mesText = text.trim();
2874+
28642875 // Requires a regex check after the slash command is pushed to output
28652876 mesText = getRegexedString(mesText, regex_placement.SLASH_COMMAND, { characterOverride: name });
28662877
public/scripts/tags.js+0 -19
@@ -1367,27 +1367,8 @@ function makeTagListDraggable(tagContainer) {
13671367 const id = $(tagElement).attr('id');
13681368 const tag = tags.find(x => x.id === id);
13691369
1370- // Fix the defined colors, because if there is no color set, they seem to get automatically set to black
1371- // based on the color picker after drag&drop, even if there was no color chosen. We just set them back.
1372- const color = $(tagElement).find('.tagColorPickerHolder .tag-color').attr('color');
1373- const color2 = $(tagElement).find('.tagColorPicker2Holder .tag-color2').attr('color');
1374- if (color === '' || color === undefined) {
1375- tag.color = '';
1376- fixColor('background-color', tag.color);
1377- }
1378- if (color2 === '' || color2 === undefined) {
1379- tag.color2 = '';
1380- fixColor('color', tag.color2);
1381- }
1382-
13831370 // Update the sort order
13841371 tag.sort_order = i;
1385-
1386- function fixColor(property, color) {
1387- $(tagElement).find('.tag_view_name').css(property, color);
1388- $(`.tag[id="${id}"]`).css(property, color);
1389- $(`.bogus_folder_select[tagid="${id}"] .avatar`).css(property, color);
1390- }
13911372 });
13921373
13931374 // If tags were dragged manually, we have to disable auto sorting
public/scripts/templates/tabbyDownloader.html+2 -2
@@ -1,6 +1,6 @@
11<div id="tabby_downloader_popup">
22 <div>
33 <h3><strong data-i18n="Download Model">Download Model</strong>
44 <a href="https://github.com/theroyallab/async-hf-downloader" class="notes-link" target="_blank">
55 <span class="note-link-span">?</span>
66 </a>
@@ -58,4 +58,4 @@
5858 <textarea class="text_pole textarea_compact" name="tabby_download_exclude" placeholder="Ex. *.txt"></textarea>
5959 </div>
6060 </div>
61-</div>
61 \ No newline at end of file
61+</div>
public/scripts/templates/welcome.html+1 -1
@@ -31,7 +31,7 @@
3131<h3 data-i18n="Confused or lost?">Confused or lost?</h3>
3232<ul>
3333 <li>
3434 <span class="note-link-span"><a class="fa-solid fa-circle-question" target="_blank" href="https://docs.sillytavern.app/" data-i18n=""></a></span> - <span data-i18n="click these icons!">click these icons!</span>
3535 </li>
3636 <li>
3737 <span data-i18n="Enter">Enter </span><code>/?</code><span data-i18n="in the chat bar"> in the chat bar</span>