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

#911 Fix expressions

Browse Source
This commit is contained in:
Cohee
2023-08-10 12:42:52 +03:00
parent 78c599a413
commit 2622999284
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/extensions/expressions/index.js
View File

@@ -515,7 +515,7 @@ async function moduleWorker() {
//set checkbox to global var //set checkbox to global var
$('#image_type_toggle').prop('checked', extension_settings.expressions.live2d); $('#image_type_toggle').prop('checked', extension_settings.expressions.live2d);
if(extension_settings.expressions.live2d == true){ if (extension_settings.expressions.live2d) {
setLive2dState(extension_settings.expressions.live2d); setLive2dState(extension_settings.expressions.live2d);
} }
} }
@@ -641,7 +641,7 @@ async function live2dcheck() {
let live2dObj = spriteCache[spriteFolderName].find(obj => obj.label === 'live2d'); let live2dObj = spriteCache[spriteFolderName].find(obj => obj.label === 'live2d');
let live2dPath_f = live2dObj ? live2dObj.path : null; let live2dPath_f = live2dObj ? live2dObj.path : null;
if(live2dPath_f != null){ if (live2dPath_f != null) {
//console.log("live2dPath_f " + live2dPath_f); //console.log("live2dPath_f " + live2dPath_f);
return true; return true;
} else { } else {
@@ -654,7 +654,7 @@ async function live2dcheck() {
} }
} }
function setLive2dState(switch_var){ function setLive2dState(switch_var) {
extension_settings.expressions.live2d = switch_var; // Store setting extension_settings.expressions.live2d = switch_var; // Store setting
saveSettingsDebounced(); saveSettingsDebounced();
@@ -674,10 +674,6 @@ function setLive2dState(switch_var){
//console.log("Live2d does not exist."); //console.log("Live2d does not exist.");
} }
}); });
} }
function getSpriteFolderName(message) { function getSpriteFolderName(message) {
@@ -867,8 +863,7 @@ async function getExpressionsList() {
} }
async function setExpression(character, expression, force) { async function setExpression(character, expression, force) {
if (extension_settings.expressions.live2d == false) { if (!extension_settings.expressions.live2d) {
console.debug('entered setExpressions'); console.debug('entered setExpressions');
await validateImages(character); await validateImages(character);
const img = $('img.expression'); const img = $('img.expression');
@@ -1260,6 +1255,7 @@ function setExpressionOverrideHtml(forceClear = false) {
<input id="image_type_toggle" type="checkbox"> <input id="image_type_toggle" type="checkbox">
<span class="slider round"></span> <span class="slider round"></span>
<label for="image_type_toggle">Image Type - Live2d (extras)</label> <label for="image_type_toggle">Image Type - Live2d (extras)</label>
</label>
</div> </div>
<div class="offline_mode"> <div class="offline_mode">
<small>You are in offline mode. Click on the image below to set the expression.</small> <small>You are in offline mode. Click on the image below to set the expression.</small>