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 custom

Browse Source
This commit is contained in:
Cohee
2023-12-20 18:37:47 +02:00
parent 5734dbd17c ebec26154c
commit cf8d7e7d35
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/script.js
View File

@ -283,6 +283,10 @@ DOMPurify.addHook("uponSanitizeAttribute", (_, data, config) => {
case 'class': { case 'class': {
if (data.attrValue) { if (data.attrValue) {
data.attrValue = data.attrValue.split(' ').map((v) => { data.attrValue = data.attrValue.split(' ').map((v) => {
if (v.startsWith('fa-') || v.startsWith('note-') || v === 'monospace') {
return v;
}
return "custom-" + v; return "custom-" + v;
}).join(' '); }).join(' ');
} }
@ -7908,7 +7912,7 @@ jQuery(async function () {
} }
registerSlashCommand('dupe', DupeChar, [], '– duplicates the currently selected character', true, true); registerSlashCommand('dupe', DupeChar, [], '– duplicates the currently selected character', true, true);
registerSlashCommand('api', connectAPISlash, [], `<span class="monospace">(${Object.keys(CONNECT_API_MAP)})</span> – connect to an API`, true, true); registerSlashCommand('api', connectAPISlash, [], `<span class="monospace">(${Object.keys(CONNECT_API_MAP).join(', ')})</span> – connect to an API`, true, true);
registerSlashCommand('impersonate', doImpersonate, ['imp'], '– calls an impersonation response', true, true); registerSlashCommand('impersonate', doImpersonate, ['imp'], '– calls an impersonation response', true, true);
registerSlashCommand('delchat', doDeleteChat, [], '– deletes the current chat', true, true); registerSlashCommand('delchat', doDeleteChat, [], '– deletes the current chat', true, true);
registerSlashCommand('closechat', doCloseChat, [], '– closes the current chat', true, true); registerSlashCommand('closechat', doCloseChat, [], '– closes the current chat', true, true);

2
public/scripts/templates/welcome.html
View File

@ -15,7 +15,7 @@
<h3>Confused or lost?</h3> <h3>Confused or lost?</h3>
<ul> <ul>
<li> <li>
<span class="note-link-span">?</span> - click these icons! <span class="note-link-span"><a class="fa-solid fa-circle-question" target="_blank" href="https://docs.sillytavern.app/"></a></span> - click these icons!
</li> </li>
<li> <li>
Enter <code>/?</code> in the chat bar Enter <code>/?</code> in the chat bar