From ee3829d054460710332482f5c78890dd1449ddd4 Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Fri, 31 Jan 2020 21:02:37 +0100 Subject: [PATCH] improve error message --- res/include/script/dependencies/UploadManager.js | 2 +- res/include/script/homepage.js | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/res/include/script/dependencies/UploadManager.js b/res/include/script/dependencies/UploadManager.js index 0bb29fb..6003658 100644 --- a/res/include/script/dependencies/UploadManager.js +++ b/res/include/script/dependencies/UploadManager.js @@ -152,7 +152,7 @@ UploadManager.prototype.uploadThread = function() { // Request did not arrive if (job.tries === 3) { // Upload failed if (typeof(job.onFailure) === "function") { - job.onFailure(xhr.response, xhr.response); + job.onFailure(xhr.responseText, xhr.responseText); } } else { // Try again job.tries++; diff --git a/res/include/script/homepage.js b/res/include/script/homepage.js index 5d84cf3..bf91592 100644 --- a/res/include/script/homepage.js +++ b/res/include/script/homepage.js @@ -54,13 +54,18 @@ UploadProgressBar.prototype.onFinished = function(id){ this.uploadDiv.appendChild(linkSpan) } UploadProgressBar.prototype.onFailure = function(val, msg) { + if (val === "") { + val = "Could not connect to server"; + } + this.uploadDiv.innerHTML = "" // Remove uploading progress this.uploadDiv.style.background = 'var(--danger_color)' + this.uploadDiv.style.color = 'var(--highlight_text_color)' + this.uploadDiv.appendChild(document.createTextNode("Upload failed: ")) + this.uploadDiv.appendChild(document.createTextNode(msg+" ("+val+")")) + this.uploadDiv.appendChild(document.createElement("br")) this.uploadDiv.appendChild(document.createTextNode(this.file.name)) - this.uploadDiv.appendChild(document.createElement("br")) - this.uploadDiv.appendChild(document.createTextNode("Upload failed after three tries:")) - this.uploadDiv.appendChild(document.createElement("br")) - this.uploadDiv.appendChild(document.createTextNode(val)) + console.log(msg); }