Merge branch 'browser_popup'

diff --git a/lemmy-translations b/lemmy-translations
index ae3132fef13542ab7fc337361bf484183d12d786..94b9b5debdaa40facf13a852cb096ef0cbd34ad7 160000 (submodule)
--- a/lemmy-translations
+++ b/lemmy-translations
@@ -1 +1 @@
-Subproject commit ae3132fef13542ab7fc337361bf484183d12d786
+Subproject commit 94b9b5debdaa40facf13a852cb096ef0cbd34ad7

diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx
index 69bcd6df2c009bc592068c2ddeb2b31916422372..8cdfaadc33b0dafd82aee0241ee037681b3bf9f1 100644 (file)
--- a/src/shared/components/common/markdown-textarea.tsx
+++ b/src/shared/components/common/markdown-textarea.tsx
@@ -386,8 +386,9 @@ export class MarkdownTextArea extends Component<
           let textarea: any = document.getElementById(i.id);
           autosize.update(textarea);
           pictrsDeleteToast(
-            i18n.t("click_to_delete_picture"),
-            i18n.t("picture_deleted"),
+            `${i18n.t("click_to_delete_picture")}: ${file.name}`,
+            `${i18n.t("picture_deleted")}: ${file.name}`,
+            `${i18n.t("failed_to_delete_picture")}: ${file.name}`,
             deleteUrl
           );
         } else {

diff --git a/src/shared/components/post/post-form.tsx b/src/shared/components/post/post-form.tsx
index 8addc859fc03bcba2303f85982bede3b35c43cd8..0f8ea0bbc11e068b1c95144a5d7213df0812aa75 100644 (file)
--- a/src/shared/components/post/post-form.tsx
+++ b/src/shared/components/post/post-form.tsx
@@ -641,8 +641,9 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
           i.state.postForm.url = Some(url);
           i.setState({ imageLoading: false });
           pictrsDeleteToast(
-            i18n.t("click_to_delete_picture"),
-            i18n.t("picture_deleted"),
+            `${i18n.t("click_to_delete_picture")}: ${file.name}`,
+            `${i18n.t("picture_deleted")}: ${file.name}`,
+            `${i18n.t("failed_to_delete_picture")}: ${file.name}`,
             deleteUrl
           );
         } else {

diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index d8703252fcbbda0fbc8917bedbc36fe917b88ecc..b65c425235171c0f2fb73ea340672823b8d009bd 100644 (file)
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -540,6 +540,7 @@ export function toast(text: string, background = "success") {
 export function pictrsDeleteToast(
   clickToDeleteText: string,
   deletePictureText: string,
+  failedDeletePictureText: string,
   deleteUrl: string
 ) {
   if (isBrowser()) {
@@ -552,9 +553,14 @@ export function pictrsDeleteToast(
       duration: 10000,
       onClick: () => {
         if (toast) {
-          window.location.replace(deleteUrl);
-          alert(deletePictureText);
-          toast.hideToast();
+          fetch(deleteUrl).then(res => {
+            toast.hideToast();
+            if (res.ok === true) {
+              alert(deletePictureText);
+            } else {
+              alert(failedDeletePictureText);
+            }
+          });
         }
       },
       close: true,