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

Fix sprite upload replace existing

Browse Source 
- Also fix form not resetting on cancel of replace popup
This commit is contained in:
Wolfsblvt
2025-02-20 19:25:20 +01:00
parent 19e2a2f7d2
commit 2834681a4b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1739,12 +1739,13 @@ async function onClickExpressionUpload(event) {
}); });
} }
spriteName = null;
const suggestedSpriteName = generateUniqueSpriteName(expression, existingFiles);
const message = await renderExtensionTemplateAsync(MODULE_NAME, 'templates/upload-expression', { expression, clickedFileName }); const message = await renderExtensionTemplateAsync(MODULE_NAME, 'templates/upload-expression', { expression, clickedFileName });
spriteName = generateUniqueSpriteName(expression, existingFiles);
const input = await Popup.show.input(t`Upload Expression Sprite`, message, const input = await Popup.show.input(t`Upload Expression Sprite`, message,
spriteName, { customButtons: customButtons }); suggestedSpriteName, { customButtons: customButtons });
if (input) { if (input) {
if (!validateExpressionSpriteName(expression, input)) { if (!validateExpressionSpriteName(expression, input)) {
@ -1752,8 +1753,6 @@ async function onClickExpressionUpload(event) {
return; return;
} }
spriteName = input; spriteName = input;
} else {
spriteName = null;
} }
} }
} else { } else {
@ -1762,6 +1761,8 @@ async function onClickExpressionUpload(event) {
if (!spriteName) { if (!spriteName) {
toastr.warning(t`Cancelled uploading sprite.`, t`Upload Cancelled`); toastr.warning(t`Cancelled uploading sprite.`, t`Upload Cancelled`);
// Reset the input
e.target.form.reset();
return; return;
} }