From 12abf8afb04f5d7c897e07ded326a8253ac55ad9 Mon Sep 17 00:00:00 2001 From: ge64qev Date: Fri, 3 May 2024 15:24:33 +0200 Subject: [PATCH 1/2] Fixed issue that Drag and Droppped Files can not be deleted --- src/main/resources/static/js/fileInput.js | 5 +++++ src/main/resources/static/js/merge.js | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/main/resources/static/js/fileInput.js b/src/main/resources/static/js/fileInput.js index 89ad1ad90b6..001c8f24f3b 100644 --- a/src/main/resources/static/js/fileInput.js +++ b/src/main/resources/static/js/fileInput.js @@ -104,4 +104,9 @@ function setupFileInput(chooser) { $(inputElement).siblings(".custom-file-label").addClass("selected").html(pdfPrompt); } } + //Listen for event of file being removed and the filter it out of the allFiles array + document.addEventListener("fileRemoved", function (e) { + const fileName = e.detail; + allFiles = allFiles.filter(file => file.name !== fileName); + }); } diff --git a/src/main/resources/static/js/merge.js b/src/main/resources/static/js/merge.js index 4936fa6bcda..f86cf9965e2 100644 --- a/src/main/resources/static/js/merge.js +++ b/src/main/resources/static/js/merge.js @@ -69,8 +69,14 @@ function attachMoveButtons() { removeButtons[i].addEventListener("click", function (event) { event.preventDefault(); var parent = this.closest(".list-group-item"); + //Get name of removed file + var fileName = parent.querySelector(".filename").innerText; parent.remove(); updateFiles(); + //Dispatch a custom event with the name of the removed file + var event = new CustomEvent("fileRemoved", { detail: fileName }); + document.dispatchEvent(event); + //end new code }); } } From 8e590675d3fa7d713db080ed4a1f4bfea49128d4 Mon Sep 17 00:00:00 2001 From: ge64qev Date: Fri, 3 May 2024 15:40:53 +0200 Subject: [PATCH 2/2] Deleted unnecessary Comment --- src/main/resources/static/js/merge.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/static/js/merge.js b/src/main/resources/static/js/merge.js index f86cf9965e2..55575727701 100644 --- a/src/main/resources/static/js/merge.js +++ b/src/main/resources/static/js/merge.js @@ -76,7 +76,6 @@ function attachMoveButtons() { //Dispatch a custom event with the name of the removed file var event = new CustomEvent("fileRemoved", { detail: fileName }); document.dispatchEvent(event); - //end new code }); } }