deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-16 04:25:13 +02:00
Code Issues Projects Releases Wiki Activity

Fix uploader mount/unmount lifecycle #4691

Browse source
This commit is contained in:
Reto Brunner 2023-02-18 11:16:30 +01:00
parent 2f04150461 2ce374fe85
commit d93cd88dd5
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/components/ChatInput.vue
View file

@ -337,6 +337,7 @@ export default defineComponent({
autocompletionRef.value = undefined; autocompletionRef.value = undefined;
} }
upload.unmounted();
upload.abort(); upload.abort();
}); });

27
client/js/upload.ts
View file

@ -18,18 +18,26 @@ class Uploader {
onPaste = (e: ClipboardEvent) => this.paste(e); onPaste = (e: ClipboardEvent) => this.paste(e);
init() { init() {
document.addEventListener("dragenter", this.onDragEnter);
document.addEventListener("dragover", this.onDragOver);
document.addEventListener("dragleave", this.onDragLeave);
document.addEventListener("drop", this.onDrop);
document.addEventListener("paste", this.onPaste);
socket.on("upload:auth", (token) => this.uploadNextFileInQueue(token)); socket.on("upload:auth", (token) => this.uploadNextFileInQueue(token));
} }
mounted() { mounted() {
this.overlay = document.getElementById("upload-overlay") as HTMLDivElement; this.overlay = document.getElementById("upload-overlay") as HTMLDivElement;
this.uploadProgressbar = document.getElementById("upload-progressbar") as HTMLSpanElement; this.uploadProgressbar = document.getElementById("upload-progressbar") as HTMLSpanElement;
document.addEventListener("dragenter", this.onDragEnter);
document.addEventListener("dragover", this.onDragOver);
document.addEventListener("dragleave", this.onDragLeave);
document.addEventListener("drop", this.onDrop);
document.addEventListener("paste", this.onPaste);
}
unmounted() {
document.removeEventListener("dragenter", this.onDragEnter);
document.removeEventListener("dragover", this.onDragOver);
document.removeEventListener("dragleave", this.onDragLeave);
document.removeEventListener("drop", this.onDrop);
document.removeEventListener("paste", this.onPaste);
} }
dragOver(event: DragEvent) { dragOver(event: DragEvent) {
@ -308,12 +316,6 @@ class Uploader {
this.xhr.abort(); this.xhr.abort();
this.xhr = null; this.xhr = null;
} }
document.removeEventListener("dragenter", this.onDragEnter);
document.removeEventListener("dragover", this.onDragOver);
document.removeEventListener("dragleave", this.onDragLeave);
document.removeEventListener("drop", this.onDrop);
document.removeEventListener("paste", this.onPaste);
} }
} }
@ -323,5 +325,6 @@ export default {
abort: () => instance.abort(), abort: () => instance.abort(),
initialize: () => instance.init(), initialize: () => instance.init(),
mounted: () => instance.mounted(), mounted: () => instance.mounted(),
unmounted: () => instance.unmounted(),
triggerUpload: (files) => instance.triggerUpload(files), triggerUpload: (files) => instance.triggerUpload(files),
}; };