Avoid browser warning about leaving page, handle delete image fail and add user filenames to messages.

This commit is contained in:
sam365724 2022-09-30 22:26:32 +02:00
parent 53e973c140
commit f2a4ebd92a
2 changed files with 14 additions and 5 deletions

View file

@ -367,8 +367,9 @@ export class MarkdownTextArea extends Component<
let textarea: any = document.getElementById(i.id); let textarea: any = document.getElementById(i.id);
autosize.update(textarea); autosize.update(textarea);
pictrsDeleteToast( pictrsDeleteToast(
i18n.t("click_to_delete_picture"), i18n.t("click_to_delete_picture").concat('\n(', file.name,')'),
i18n.t("picture_deleted"), i18n.t("picture_deleted").concat('\n(', file.name,')'),
i18n.t("fail_picture_deleted").concat('\n(', file.name,')'),
deleteUrl deleteUrl
); );
} else { } else {

View file

@ -543,6 +543,7 @@ export function toast(text: string, background = "success") {
export function pictrsDeleteToast( export function pictrsDeleteToast(
clickToDeleteText: string, clickToDeleteText: string,
deletePictureText: string, deletePictureText: string,
failedDeletePictureText: string,
deleteUrl: string deleteUrl: string
) { ) {
if (isBrowser()) { if (isBrowser()) {
@ -555,9 +556,16 @@ export function pictrsDeleteToast(
duration: 10000, duration: 10000,
onClick: () => { onClick: () => {
if (toast) { if (toast) {
window.location.replace(deleteUrl); fetch(deleteUrl, {})
alert(deletePictureText); .then( res => {
console.log(res)
toast.hideToast(); toast.hideToast();
if (res.ok === true){
alert(deletePictureText);
} else{
alert(failedDeletePictureText);
}
})
} }
}, },
close: true, close: true,