From cb06dcdbfbafc2ab143616317ec2f7e8dc6ae233 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 22 Jan 2021 19:33:09 -0700 Subject: [PATCH] Fix barcode detection --- www/assets/js/track.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/www/assets/js/track.js b/www/assets/js/track.js index 45a04bd..29d61ad 100644 --- a/www/assets/js/track.js +++ b/www/assets/js/track.js @@ -27,13 +27,14 @@ function addTrackingSuggestions() { function openTrackingBarcodeScanner() { scanBarcode(function (result) { var code = ""; + var coderegex = /^[0-9a-zA-Z]{5,40}$/; if (result.startsWith("https://helena.express/track#")) { code = result.split("#")[1]; } else if (result.startsWith("http") && result.includes("#")) { - if (result.split("#")[1].test(/^[0-9a-zA-Z]{5,40}$/)) { + if (coderegex.test(result.split("#")[1])) { code = result.split("#")[1]; } - } else if (result.test(/^[0-9a-zA-Z]{5,40}$/)) { + } else if (coderegex.test(result)) { code = result; } else { app.dialog.alert("This app can't understand what's in that barcode.", "Error");