rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-11 17:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up commented code

Browse Source
This commit is contained in:
Cohee 2024-08-11 00:10:17 +03:00
parent d7d99fa94c
commit 41a3a97925
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -5310,12 +5310,10 @@
<div class="flex-container flex1"> <div class="flex-container flex1">
<textarea class="text_pole" rows="1" name="comment" maxlength="5000" data-i18n="[placeholder]Entry Title/Memo" placeholder="Entry Title/Memo"></textarea> <textarea class="text_pole" rows="1" name="comment" maxlength="5000" data-i18n="[placeholder]Entry Title/Memo" placeholder="Entry Title/Memo"></textarea>
</div> </div>
<!-- <span class="world_entry_form_position_value"></span> -->
<select data-i18n="[title]WI Entry Status:🔵 Constant🟢 Normal🔗 Vectorized❌ Disabled" title="WI Entry Status:&#13;🔵 Constant&#13;🟢 Normal&#13;🔗 Vectorized&#13;❌ Disabled" name="entryStateSelector" class="text_pole widthNatural margin0"> <select data-i18n="[title]WI Entry Status:🔵 Constant🟢 Normal🔗 Vectorized❌ Disabled" title="WI Entry Status:&#13;🔵 Constant&#13;🟢 Normal&#13;🔗 Vectorized&#13;❌ Disabled" name="entryStateSelector" class="text_pole widthNatural margin0">
<option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option> <option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option>
<option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option> <option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option>
<option value="vectorized" title="Vectorized" data-i18n="[title]WI_Entry_Status_Vectorized">🔗</option> <option value="vectorized" title="Vectorized" data-i18n="[title]WI_Entry_Status_Vectorized">🔗</option>
<!--<option value="disabled" title="Disabled" data-i18n="[title]WI_Entry_Status_Disabled">❌</option>-->
</select> </select>
</div> </div>
<div class="WIEnteryHeaderControls flex-container"> <div class="WIEnteryHeaderControls flex-container">

25
public/scripts/world-info.js
View File

@ -2872,42 +2872,22 @@ async function getWorldEntry(name, data, entry) {
switch (value) { switch (value) {
case 'constant': case 'constant':
data.entries[uid].constant = true; data.entries[uid].constant = true;
//data.entries[uid].disable = false;
data.entries[uid].vectorized = false; data.entries[uid].vectorized = false;
setWIOriginalDataValue(data, uid, 'enabled', true);
setWIOriginalDataValue(data, uid, 'constant', true); setWIOriginalDataValue(data, uid, 'constant', true);
setWIOriginalDataValue(data, uid, 'extensions.vectorized', false); setWIOriginalDataValue(data, uid, 'extensions.vectorized', false);
//template.removeClass('disabledWIEntry');
break; break;
case 'normal': case 'normal':
data.entries[uid].constant = false; data.entries[uid].constant = false;
//data.entries[uid].disable = false;
data.entries[uid].vectorized = false; data.entries[uid].vectorized = false;
setWIOriginalDataValue(data, uid, 'enabled', true);
setWIOriginalDataValue(data, uid, 'constant', false); setWIOriginalDataValue(data, uid, 'constant', false);
setWIOriginalDataValue(data, uid, 'extensions.vectorized', false); setWIOriginalDataValue(data, uid, 'extensions.vectorized', false);
//template.removeClass('disabledWIEntry');
break; break;
case 'vectorized': case 'vectorized':
data.entries[uid].constant = false; data.entries[uid].constant = false;
//data.entries[uid].disable = false;
data.entries[uid].vectorized = true; data.entries[uid].vectorized = true;
setWIOriginalDataValue(data, uid, 'enabled', true);
setWIOriginalDataValue(data, uid, 'constant', false); setWIOriginalDataValue(data, uid, 'constant', false);
setWIOriginalDataValue(data, uid, 'extensions.vectorized', true); setWIOriginalDataValue(data, uid, 'extensions.vectorized', true);
//template.removeClass('disabledWIEntry');
break; break;
/*
case 'disabled':
data.entries[uid].constant = false;
data.entries[uid].disable = true;
data.entries[uid].vectorized = false;
setWIOriginalDataValue(data, uid, 'enabled', false);
setWIOriginalDataValue(data, uid, 'constant', false);
setWIOriginalDataValue(data, uid, 'extensions.vectorized', false);
template.addClass('disabledWIEntry');
break;
*/
} }
await saveWorldInfo(name, data); await saveWorldInfo(name, data);
@ -2918,7 +2898,7 @@ async function getWorldEntry(name, data, entry) {
entryKillSwitch.on('click', async function (event) { entryKillSwitch.on('click', async function (event) {
const uid = entry.uid; const uid = entry.uid;
data.entries[uid].disable = !data.entries[uid].disable; data.entries[uid].disable = !data.entries[uid].disable;
let isActive = !data.entries[uid].disable; const isActive = !data.entries[uid].disable;
setWIOriginalDataValue(data, uid, 'enabled', isActive); setWIOriginalDataValue(data, uid, 'enabled', isActive);
template.toggleClass('disabledWIEntry', !isActive); template.toggleClass('disabledWIEntry', !isActive);
entryKillSwitch.toggleClass('fa-toggle-off', !isActive); entryKillSwitch.toggleClass('fa-toggle-off', !isActive);
@ -2928,9 +2908,6 @@ async function getWorldEntry(name, data, entry) {
}); });
const entryState = function () { const entryState = function () {
/* if (entry.disable === true) {
return 'disabled';
} else */
if (entry.constant === true) { if (entry.constant === true) {
return 'constant'; return 'constant';
} else if (entry.vectorized === true) { } else if (entry.vectorized === true) {