From c58b36e9c53e47e9d055507a32836ba30b98e6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Thu, 7 May 2020 23:19:40 +0200 Subject: [PATCH] Close webcam when leaving scanner page. --- assets/ts_src/event_listeners.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/ts_src/event_listeners.ts b/assets/ts_src/event_listeners.ts index 0151266f..d4deeed8 100644 --- a/assets/ts_src/event_listeners.ts +++ b/assets/ts_src/event_listeners.ts @@ -569,17 +569,25 @@ $(document).on("ajaxUI:reload", function() { }) }); +//Reuse codereader between multiple requests +const codeReader = new ZXing.BrowserMultiFormatReader(); + //Init barcode scanner $(document).on("ajaxUI:start ajaxUI:reload", function() { //Skip if we are not on scanner page... if (!document.getElementById('scan_dialog_form')) { + + codeReader.reset(); + return; } let selectedDeviceId; - const codeReader = new ZXing.BrowserMultiFormatReader(); + + + //Save it for later, so we can reset it console.log('ZXing code reader initialized'); codeReader.listVideoInputDevices() .then((videoInputDevices) => {