From 5577123238b57bcc9ae36b0ba35beff4316652c5 Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Tue, 3 Nov 2020 15:30:18 +0100
Subject: [PATCH] Adding the video tag to dom QR code scanner
---
packages/qr-code-scanner/src/qr-code-scanner.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/packages/qr-code-scanner/src/qr-code-scanner.js b/packages/qr-code-scanner/src/qr-code-scanner.js
index 383d0664..39285b6f 100644
--- a/packages/qr-code-scanner/src/qr-code-scanner.js
+++ b/packages/qr-code-scanner/src/qr-code-scanner.js
@@ -143,8 +143,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
this._outputData = null;
this._videoRunning = false;
this._lock = new Mutex();
-
- this.videoReady = false;
}
static get scopedElements() {
@@ -227,12 +225,14 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
await this.updateComplete;
let targetCanvas = this._("#canvas");
+ let targetvideo = this._("#video");
let canvasElement = document.createElement("canvas");
let firstDrawDone = false;
this._askPermission = true;
this._loadingMessage = i18n.t('no-camera-access');
let video = await createVideoElement(this._activeCamera);
+ targetvideo.appendChild(video);
this._askPermission = false;
let lastCode = null;
@@ -242,11 +242,9 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
let detectorRunning = false;
const tick = () => {
- console.log("---", this.videoReady);
this._requestID = null;
- if (video.readyState === video.HAVE_ENOUGH_DATA || this.videoReady) {
+ if (video.readyState === video.HAVE_ENOUGH_DATA) {
this._loading = false;
- this.videoReady = true;
// draw into a temporary canvas first
canvasElement.height = video.videoHeight;
canvasElement.width = video.videoWidth;
@@ -385,7 +383,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
this._askPermission = false;
this._videoRunning = false;
this._loading = false;
- this.videoReady = false;
this._loadingMessage = '';
} finally {
@@ -501,6 +498,7 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
</div>
</div>
<canvas id="canvas" class="${classMap({hidden: !showCanvas})}"></canvas>
+ <div id="video"></div>
<div class="output ${classMap({hidden: !(this.showOutput && showCanvas)})}">
${ (this._outputData !== null) ? html`
<div><b>${i18n.t('data')}:</b> <span>${this._outputData}</span></div>
--
GitLab