Fix sprite upload replace existing - Also fix form not resetting on cancel of replace popup

2834681a4b11a5e7dc45796d37f2b9f0e3978db2

Wolfsblvt <wolfsblvt@gmail.com>

public/scripts/extensions/expressions/index.js+6 -5 Viewed

                     });
+                }
-                const message = await renderExtensionTemplateAsync(MODULE_NAME, 'templates/upload-expression', { expression, clickedFileName });
+                spriteName = null;
+                const suggestedSpriteName = generateUniqueSpriteName(expression, existingFiles);
-                spriteName = generateUniqueSpriteName(expression, existingFiles);
+                const message = await renderExtensionTemplateAsync(MODULE_NAME, 'templates/upload-expression', { expression, clickedFileName });
                 const input = await Popup.show.input(t`Upload Expression Sprite`, message,
-                    spriteName, { customButtons: customButtons });
+                    suggestedSpriteName, { customButtons: customButtons });
                 if (input) {
                     if (!validateExpressionSpriteName(expression, input)) {

@@ -1752,8 +1753,6 @@ async function onClickExpressionUpload(event) {
1752	return;	1753	return;
1753	}	1754	}
1754	spriteName = input;	1755	spriteName = input;
1755	} else {
1756	spriteName = null;
1757	}	1756	}
1758	}	1757	}
1759	} else {	1758	} else {

         if (!spriteName) {
             toastr.warning(t`Cancelled uploading sprite.`, t`Upload Cancelled`);
+            // Reset the input
+            e.target.form.reset();
             return;
+        }