Merge branch 'main' into changes

src/main/resources/static/js/githubVersion.js

@@ -18,7 +18,7 @@ function compareVersions(version1, version2) {
 
 
 async function getLatestReleaseVersion() {
-    const url = "https://api.github.com/repos/Frooodle/Stirling-PDF/releases/latest";
+    const url = "https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest";
     try {
         const response = await fetch(url);
         const data = await response.json();
@@ -52,4 +52,4 @@ async function checkForUpdate() {
 
 document.addEventListener('DOMContentLoaded', (event) => {
     checkForUpdate();
-});
+});

src/main/resources/static/js/merge.js

@@ -10,7 +10,6 @@ document.getElementById("fileInput-input").addEventListener("change", function()
 
 function displayFiles(files) {
     var list = document.getElementById("selectedFiles");
-    list.innerHTML = "";
 
     for (var i = 0; i < files.length; i++) {
         var item = document.createElement("li");
@@ -21,6 +20,7 @@ function displayFiles(files) {
                 <div class="arrows d-flex">
                     <button class="btn btn-secondary move-up"><span>&uarr;</span></button>
                     <button class="btn btn-secondary move-down"><span>&darr;</span></button>
+                    <button class="btn btn-danger remove-file"><span>&times;</span></button>
                 </div>
             </div>
         `;
@@ -56,6 +56,16 @@ function attachMoveButtons() {
             }
         });
     }
+
+    var removeButtons = document.querySelectorAll(".remove-file");
+    for (var i = 0; i < removeButtons.length; i++) {
+         removeButtons[i].addEventListener("click", function (event) {
+              event.preventDefault();
+              var parent = this.closest(".list-group-item");
+              parent.remove();
+              updateFiles();
+         });
+    }
 }
 
 document.getElementById("sortByNameBtn").addEventListener("click", function() {

src/main/resources/static/pdfjs/cmaps/CNS2-V.bcmap

@@ -1,3 +1,3 @@
-àRCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
 See ./LICENSEáCNS2-H

src/main/resources/static/pdfjs/cmaps/ETenms-B5-H.bcmap

@@ -1,3 +1,3 @@
-àRCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
 See ./LICENSEá	ETen-B5-H`
 ^