Update sprite delete call

ef127df623e63014ad272491dacdea23342c19ec

Wolfsblvt <wolfsblvt@gmail.com>

public/scripts/extensions/expressions/index.js+8 -3 Viewed

     // Prevents the expression from being set
     event.stopPropagation();
-    const confirmation = await callPopup('<h3>Are you sure?</h3>Once deleted, it\'s gone forever!', 'confirm');
+    const expressionListItem = $(this).closest('.expression_list_item');
+    const expression = expressionListItem.data('expression');
+    const confirmation = await Popup.show.confirm(t`Delete Expression`, t`Are you sure you want to delete this expression? Once deleted, it\'s gone forever!`
+        + '<br /><br />'
+        + t`Expression: `
+        + expressionListItem.attr('data-filename'));
     if (!confirmation) {
         return;
+    }
-    const expression = $(this).closest('.expression_list_item').data('expression');
+    const fileName = expressionListItem.attr('data-filename');
     const name = $('#image_list').data('name');
     try {
         await fetch('/api/sprites/delete', {
             method: 'POST',
             headers: getRequestHeaders(),
-            body: JSON.stringify({ name, label: expression }),
+            body: JSON.stringify({ name, label: expression, spriteName: fileName }),
         });
     } catch (error) {
         toastr.error('Failed to delete image. Try again later.');

src/endpoints/sprites.js+3 -2 Viewed

 router.post('/delete', jsonParser, async (request, response) => {
     const label = request.body.label;
     const name = request.body.name;
+    const spriteName = request.body.spriteName || label;
-    if (!label || !name) {
+    if (!spriteName || !name) {
         return response.sendStatus(400);
+    }

@@ -164,7 +165,7 @@ router.post('/delete', jsonParser, async (request, response) => {
164		165
165	// Remove existing sprite with the same label	166	// Remove existing sprite with the same label
166	for (const file of files) {	167	for (const file of files) {
167	if (path.parse(file).name === label) {	168	if (path.parse(file).name === spriteName) {
168	fs.rmSync(path.join(spritesPath, file));	169	fs.rmSync(path.join(spritesPath, file));
169	}	170	}
170	}	171	}