From 88c1fd5c4345bf6257666667ed7422dbcd6573a2 Mon Sep 17 00:00:00 2001
From: Rhys Nute <nuterd@cardiff.ac.uk>
Date: Sun, 3 Dec 2023 11:16:32 +0000
Subject: [PATCH] QR updates
---
src/main/resources/static/qr-scanner.html | 4 ++--
src/main/resources/static/scripts/qr-script.js | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/static/qr-scanner.html b/src/main/resources/static/qr-scanner.html
index 9574611b..8ff5ab8f 100644
--- a/src/main/resources/static/qr-scanner.html
+++ b/src/main/resources/static/qr-scanner.html
@@ -6,8 +6,8 @@
<meta name="viewpoint" content="width-device-width, initial-scale=1.0">
<link rel="stylesheet" href="qrstyle.css">
<title>QR Code</title>
- <script src="html5-qrcode.min.js"></script>
- <script src="scripts/qr-script.js" class="domReady" type="text/javascript"></script>
+ <script th:src="@{https://unpkg.com/html5-qrcode}" type="text/javascript"></script>
+ <script th:src="@{scripts/qr-script.js}" class="domReady"></script>
</head>
<body>
diff --git a/src/main/resources/static/scripts/qr-script.js b/src/main/resources/static/scripts/qr-script.js
index 5e30f486..32404079 100644
--- a/src/main/resources/static/scripts/qr-script.js
+++ b/src/main/resources/static/scripts/qr-script.js
@@ -1,6 +1,7 @@
//qr-script file - R Nute
import {Html5QrcodeScanner} from "html5-qrcode";
import {Html5Qrcode} from "html5-qrcode";
+
function domReady(fn){
if (
document.readyState === "complete" ||
--
GitLab