From 12d234adc279ecf853b8ae21867e16e888a14994 Mon Sep 17 00:00:00 2001 From: rxdn <29165304+rxdn@users.noreply.github.com> Date: Sat, 13 Feb 2021 14:36:28 +0000 Subject: [PATCH] Use href for links --- public/static/js/utils.js | 27 ++++++++++++++++++++------ public/templates/views/logs.tmpl | 2 +- public/templates/views/ticketlist.tmpl | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/public/static/js/utils.js b/public/static/js/utils.js index 5b93045..3bb7939 100644 --- a/public/static/js/utils.js +++ b/public/static/js/utils.js @@ -28,12 +28,27 @@ function appendTd(tr, content) { function appendButton(tr, content, onclick) { const tdRemove = document.createElement('td'); - const removeButton = document.createElement('a'); - removeButton.type = 'submit'; - removeButton.classList.add('btn', 'btn-primary', 'btn-fill', 'mx-auto'); - removeButton.appendChild(document.createTextNode(content)); - removeButton.onclick = onclick; - tdRemove.appendChild(removeButton); + const btn = document.createElement('button'); + + btn.type = 'submit'; + btn.classList.add('btn', 'btn-primary', 'btn-fill', 'mx-auto'); + btn.appendChild(document.createTextNode(content)); + btn.onclick = onclick; + + tdRemove.appendChild(btn); + tr.appendChild(tdRemove); +} + +function appendButtonHref(tr, content, href) { + const tdRemove = document.createElement('td'); + const btn = document.createElement('a'); + + btn.href = href; + btn.type = 'submit'; + btn.classList.add('btn', 'btn-primary', 'btn-fill', 'mx-auto'); + btn.appendChild(document.createTextNode(content)); + + tdRemove.appendChild(btn); tr.appendChild(tdRemove); } diff --git a/public/templates/views/logs.tmpl b/public/templates/views/logs.tmpl index ea97940..76dfd0f 100644 --- a/public/templates/views/logs.tmpl +++ b/public/templates/views/logs.tmpl @@ -103,7 +103,7 @@ appendTd(tr, log.ticketid); appendTd(tr, log.username); appendTd(tr, log.userid); - appendButton(tr, 'View', () => { location.href = '/manage/{{.guildId}}/logs/view/' + log.ticketid }); + appendButtonHref(tr, 'View','/manage/{{.guildId}}/logs/view/' + log.ticketid); container.appendChild(tr); } diff --git a/public/templates/views/ticketlist.tmpl b/public/templates/views/ticketlist.tmpl index cf3b4b9..7f4b67f 100644 --- a/public/templates/views/ticketlist.tmpl +++ b/public/templates/views/ticketlist.tmpl @@ -39,7 +39,7 @@ const members = ticket.members.map(member => `${member.username}#${member.discrim}`).join(', '); appendTd(tr, members); - appendButton(tr, 'View', () => { location.href = '/manage/{{.guildId}}/tickets/view/' + ticket.ticketId }); + appendButtonHref(tr, 'View', '/manage/{{.guildId}}/tickets/view/' + ticket.ticketId); container.appendChild(tr); }