From 12cf5ed0708da9ee5f0bb976ac88b56032813665 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Sun, 3 Mar 2019 20:10:35 +0200
Subject: [PATCH] Abort file upload if ChatInput component is destroyed

---
 client/components/ChatInput.vue |  1 +
 client/js/upload.js             | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/client/components/ChatInput.vue b/client/components/ChatInput.vue
index a7cf8e6c..812bc21c 100644
--- a/client/components/ChatInput.vue
+++ b/client/components/ChatInput.vue
@@ -153,6 +153,7 @@ export default {
 	},
 	destroyed() {
 		require("../js/autocompletion").disable();
+		upload.abort();
 	},
 	methods: {
 		setPendingMessage(e) {
diff --git a/client/js/upload.js b/client/js/upload.js
index 0feb5756..da0ecbce 100644
--- a/client/js/upload.js
+++ b/client/js/upload.js
@@ -5,6 +5,7 @@ const updateCursor = require("undate").update;
 
 class Uploader {
 	init() {
+		this.xhr = null;
 		this.fileQueue = [];
 		this.overlay = document.getElementById("upload-overlay");
 		this.uploadInput = document.getElementById("upload-input");
@@ -106,6 +107,7 @@ class Uploader {
 
 	uploadSingleFile(file, token) {
 		const xhr = new XMLHttpRequest();
+		this.xhr = xhr;
 
 		xhr.upload.addEventListener("progress", (e) => {
 			const percent = Math.floor(e.loaded / e.total * 1000) / 10;
@@ -114,6 +116,8 @@ class Uploader {
 
 		xhr.onreadystatechange = () => {
 			if (xhr.readyState === XMLHttpRequest.DONE) {
+				this.xhr = null;
+
 				let response;
 
 				try {
@@ -177,6 +181,16 @@ class Uploader {
 		// Set the cursor after the link and a space
 		textbox.selectionStart = textbox.selectionEnd = textBeforeTail.length;
 	}
+
+	// TODO: This is a temporary hack while Vue porting is finalized
+	abort() {
+		this.fileQueue = [];
+
+		if (this.xhr) {
+			this.xhr.abort();
+			this.xhr = null;
+		}
+	}
 }
 
 const instance = new Uploader();
@@ -194,4 +208,8 @@ function setMaxFileSize(kb) {
 	instance.maxFileSize = kb;
 }
 
-module.exports = {initialize, setMaxFileSize};
+module.exports = {
+	abort: () => instance.abort(),
+	initialize,
+	setMaxFileSize,
+};