Fix bug in web ui download queue buttons

justin025 · Jan 27, 2025 · 40d788d · 40d788d
1 parent 1dc3d0a
commit 40d788d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/src/onthespot/resources/web/download_queue.html b/src/onthespot/resources/web/download_queue.html
@@ -170,16 +170,6 @@
                 return false;
             }
 
-            function createButton(iconSrc, altText, onClickHandler, url = '') {
-                return `
-                    <button class="download-action-button" onclick="${onClickHandler}">
-                        <a href=${url}>
-                            <img src="${iconSrc}" alt="${altText}">
-                        </a>
-                    </button>
-                `;
-            }
-
             function updateStatusMessage() {
                 const tableBody = document.getElementById('download-queue-table');
                 const totalCount = tableBody.rows.length;

diff --git a/src/onthespot/resources/web/search.html b/src/onthespot/resources/web/search.html
@@ -70,17 +70,9 @@
                             serviceNameSpan.className = 'hide-on-mobile';
                             serviceNameSpan.textContent = formatServiceName(item.item_service);
 
-                            const copyButton = `
-                                <button class="download-action-button hide-on-mobile" onclick="copyToClipboard('${item.item_url}')">
-                                    <img src="icons/link.png" alt="Copy">
-                                </button>
-                            `;
-
-                            const downloadButton = `
-                                <button class="download-action-button" onclick="handleDownload('${item.item_url}')">
-                                    <img src="icons/download.png" alt="Download">
-                                </button>
-                            `;
+                            const copyButton = createButton('icons/link.png', 'Copy Link', `copyToClipboard('${item.item_url}')`, `${item.item_url}`);
+                            const downloadButton = createButton('icons/download.png', 'Download', `handleDownload('${item.item_url}')`);
+
 
                             const row = document.createElement('tr');
 

diff --git a/src/onthespot/resources/web/utils.js b/src/onthespot/resources/web/utils.js
@@ -24,3 +24,21 @@ function formatServiceName(serviceName) {
 
     return formattedServiceName;
 }
+
+function createButton(iconSrc, altText, onClickHandler, url = null) {
+    if (url) {
+        return `
+            <button class="download-action-button" onclick="${onClickHandler}">
+                <a href="${url}" onclick="event.preventDefault();">
+                    <img src="${iconSrc}" alt="${altText}">
+                </a>
+            </button>
+        `;
+    } else {
+        return `
+            <button class="download-action-button" onclick="${onClickHandler}">
+                <img src="${iconSrc}" alt="${altText}">
+            </button>
+        `;
+    }
+}