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

Fix expression sprite sorting, fade additional

Browse Source 
- Sort alphabetically, but keep the main expression file first
- Fade additional sprite images if "allow multiple" is not chosen
This commit is contained in:
Wolfsblvt 2025-01-27 23:01:29 +01:00
parent 7063af7363
commit 84a8a2bc2b
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1349,7 +1349,7 @@ function getExpressionImageData(sprite) {
fileName: fileName,
title: fileNameWithoutExtension,
imageSrc: sprite.path,
type: fileNameWithoutExtension == sprite.label ? 'success' : 'additional',
type: 'success',
isCustom: extension_settings.expressions.custom?.includes(sprite.label),
};
}
@ -1380,8 +1380,7 @@ async function drawSpritesList(character, labels, sprites) {
const images = sprites
.filter(s => s.label === expression)
.map(s => s.files)
.flat()
.sort((a, b) => a.title.localeCompare(b.title));
.flat();
if (images.length === 0) {
const listItem = await getListItem(expression, {
@ -1444,6 +1443,21 @@ async function getSpritesList(name) {
return acc;
}, []);
// Sort the sprites for each expression alphabetically, but keep the main expression file at the front
for (const expression of grouped) {
expression.files.sort((a, b) => {
if (a.title === expression.label) return -1;
if (b.title === expression.label) return 1;
return a.title.localeCompare(b.title);
});
// Mark all besides the first sprite as 'additional'
for (let i = 1; i < expression.files.length; i++) {
expression.files[i].type = 'additional';
}
}
return grouped;
}
catch (err) {
@ -1584,7 +1598,7 @@ async function setExpression(character, expression, force = false) {
/** @type {Expression} */
const sprite = (spriteCache[character] && spriteCache[character].find(x => x.label === expression));
console.debug('checking for expression images to show..');
if (sprite) {
if (sprite && sprite.files.length > 0) {
console.debug('setting expression from character images folder');
let spriteFile = sprite.files[0];

9
public/scripts/extensions/expressions/style.css
View File

@ -204,3 +204,12 @@ img.expression.default {
align-items: baseline;
flex-direction: row;
}
#expressions_container:has(#expressions_allow_multiple:not(:checked)) #image_list .expression_list_item[data-expression-type="additional"] {
opacity: 0.3;
transition: opacity var(--animation-duration) ease;
}
#expressions_container:has(#expressions_allow_multiple:not(:checked)) #image_list .expression_list_item[data-expression-type="additional"]:hover,
#expressions_container:has(#expressions_allow_multiple:not(:checked)) #image_list .expression_list_item[data-expression-type="additional"]:focus {
opacity: unset;
}