change default QrScanner.WORKER_PATH; fix WORKER_PATH in demo

This commit is contained in:
Daniel committed 2019-02-05 09:45:48 -06:00
1 parent 2144b169d1
commit 0cc9ee2841
4 files changed
+5 -6

No files matched your search

+2
View File
@@ -49,6 +49,8 @@
<script type="module">
import QrScanner from "../qr-scanner.min.js";
QrScanner.WORKER_PATH = '../qr-scanner-worker.min.js';
const video = document.getElementById('qr-video');
const debugCheckbox = document.getElementById('debug-checkbox');
const debugCanvas = document.getElementById('debug-canvas');
+1 -3
View File
@@ -1,5 +1,3 @@
/*
@asset(/libraries/qr-scanner/qr-scanner-worker.min.js) */
'use strict';export default class QrScanner{static hasCamera(){return navigator.mediaDevices.enumerateDevices().then((devices)=>devices.some((device)=>device.kind==="videoinput")).catch(()=>false)}constructor(video,onDecode,canvasSize=QrScanner.DEFAULT_CANVAS_SIZE){this.$video=video;this.$canvas=document.createElement("canvas");this._onDecode=onDecode;this._active=false;this._paused=false;this.$canvas.width=canvasSize;this.$canvas.height=canvasSize;this._sourceRect={x:0,y:0,width:canvasSize,height:canvasSize};
this._onCanPlay=this._onCanPlay.bind(this);this._onPlay=this._onPlay.bind(this);this._onVisibilityChange=this._onVisibilityChange.bind(this);this.$video.addEventListener("canplay",this._onCanPlay);this.$video.addEventListener("play",this._onPlay);document.addEventListener("visibilitychange",this._onVisibilityChange);this._qrWorker=new Worker(QrScanner.WORKER_PATH)}destroy(){this.$video.removeEventListener("canplay",this._onCanPlay);this.$video.removeEventListener("play",this._onPlay);document.removeEventListener("visibilitychange",
this._onVisibilityChange);this.stop();this._qrWorker.postMessage({type:"close"})}start(){if(this._active&&!this._paused)return Promise.resolve();if(window.location.protocol!=="https:")console.warn("The camera stream is only accessible if the page is transferred via https.");this._active=true;this._paused=false;if(document.hidden)return Promise.resolve();clearTimeout(this._offTimeout);this._offTimeout=null;if(this.$video.srcObject){this.$video.play();return Promise.resolve()}let facingMode="environment";
@@ -14,6 +12,6 @@ scaleFactor+")"}static _getImageData(image,sourceRect=null,canvas=null,fixedCanv
canvas.height!==sourceRectHeight)){canvas.width=sourceRectWidth;canvas.height=sourceRectHeight}const context=canvas.getContext("2d",{alpha:false});context.imageSmoothingEnabled=false;context.drawImage(image,sourceRectX,sourceRectY,sourceRectWidth,sourceRectHeight,0,0,canvas.width,canvas.height);return context.getImageData(0,0,canvas.width,canvas.height)}static _loadImage(imageOrFileOrUrl){if(imageOrFileOrUrl instanceof HTMLCanvasElement||imageOrFileOrUrl instanceof HTMLVideoElement||window.ImageBitmap&&
imageOrFileOrUrl instanceof window.ImageBitmap||window.OffscreenCanvas&&imageOrFileOrUrl instanceof window.OffscreenCanvas)return Promise.resolve(imageOrFileOrUrl);else if(imageOrFileOrUrl instanceof Image)return QrScanner._awaitImageLoad(imageOrFileOrUrl).then(()=>imageOrFileOrUrl);else if(imageOrFileOrUrl instanceof File||imageOrFileOrUrl instanceof URL||typeof imageOrFileOrUrl==="string"){const image=new Image;if(imageOrFileOrUrl instanceof File)image.src=URL.createObjectURL(imageOrFileOrUrl);
else image.src=imageOrFileOrUrl;return QrScanner._awaitImageLoad(image).then(()=>{if(imageOrFileOrUrl instanceof File)URL.revokeObjectURL(image.src);return image})}else return Promise.reject("Unsupported image type.")}static _awaitImageLoad(image){return new Promise((resolve,reject)=>{if(image.complete&&image.naturalWidth!==0)resolve();else{let onLoad,onError;onLoad=()=>{image.removeEventListener("load",onLoad);image.removeEventListener("error",onError);resolve()};onError=()=>{image.removeEventListener("load",
onLoad);image.removeEventListener("error",onError);reject("Image load error")};image.addEventListener("load",onLoad);image.addEventListener("error",onError)}})}}QrScanner.DEFAULT_CANVAS_SIZE=400;QrScanner.WORKER_PATH="/libraries/qr-scanner/qr-scanner-worker.min.js";
onLoad);image.removeEventListener("error",onError);reject("Image load error")};image.addEventListener("load",onLoad);image.addEventListener("error",onError)}})}}QrScanner.DEFAULT_CANVAS_SIZE=400;QrScanner.WORKER_PATH="qr-scanner-worker.min.js";
//# sourceMappingURL=qr-scanner.min.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"sources":["qr-scanner.js"],"names":["QrScanner","navigator","mediaDevices","enumerateDevices","then","devices","some","device","kind","catch","video","onDecode","canvasSize","DEFAULT_CANVAS_SIZE","$video","$canvas","document","createElement","_onDecode","_active","_paused","width","height","_sourceRect","x","y","_onCanPlay","bind","_onPlay","_onVisibilityChange","addEventListener","_qrWorker","Worker","WORKER_PATH","removeEventListener","stop","postMessage","type","Promise","resolve","window","location","protocol","console","warn","hidden","clearTimeout","_offTimeout","srcObject","play","facingMode","_getCameraStream","stream","_setVideoMirror","e","pause","setTimeout","track","getTracks","imageOrFileOrUrl","sourceRect","worker","canvas","fixedCanvasSize","alsoTryWithoutSourceRect","promise","reject","data","timeout","onMessage","onError","event","errorMessage","message","_loadImage","image","imageData","_getImageData","buffer","scanImage","red","green","blue","inversionMode","_updateSourceRect","_scanFrame","start","smallestDimension","Math","min","videoWidth","videoHeight","sourceRectSize","round","paused","ended","requestAnimationFrame","error","exact","constraintsToTry","forEach","constraint","_getMatchingCameraStream","length","getUserMedia","shift","scaleFactor","style","transform","sourceRectX","sourceRectY","sourceRectWidth","sourceRectHeight","context","getContext","alpha","imageSmoothingEnabled","drawImage","getImageData","HTMLCanvasElement","HTMLVideoElement","ImageBitmap","OffscreenCanvas","Image","_awaitImageLoad","File","URL","src","createObjectURL","revokeObjectURL","complete","naturalWidth","onLoad"],"mappings":"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 truncated
{"version":3,"sources":["qr-scanner.js"],"names":["QrScanner","navigator","mediaDevices","enumerateDevices","then","devices","some","device","kind","catch","video","onDecode","canvasSize","DEFAULT_CANVAS_SIZE","$video","$canvas","document","createElement","_onDecode","_active","_paused","width","height","_sourceRect","x","y","_onCanPlay","bind","_onPlay","_onVisibilityChange","addEventListener","_qrWorker","Worker","WORKER_PATH","removeEventListener","stop","postMessage","type","Promise","resolve","window","location","protocol","console","warn","hidden","clearTimeout","_offTimeout","srcObject","play","facingMode","_getCameraStream","stream","_setVideoMirror","e","pause","setTimeout","track","getTracks","imageOrFileOrUrl","sourceRect","worker","canvas","fixedCanvasSize","alsoTryWithoutSourceRect","promise","reject","data","timeout","onMessage","onError","event","errorMessage","message","_loadImage","image","imageData","_getImageData","buffer","scanImage","red","green","blue","inversionMode","_updateSourceRect","_scanFrame","start","smallestDimension","Math","min","videoWidth","videoHeight","sourceRectSize","round","paused","ended","requestAnimationFrame","error","exact","constraintsToTry","forEach","constraint","_getMatchingCameraStream","length","getUserMedia","shift","scaleFactor","style","transform","sourceRectX","sourceRectY","sourceRectWidth","sourceRectHeight","context","getContext","alpha","imageSmoothingEnabled","drawImage","getImageData","HTMLCanvasElement","HTMLVideoElement","ImageBitmap","OffscreenCanvas","Image","_awaitImageLoad","File","URL","src","createObjectURL","revokeObjectURL","complete","naturalWidth","onLoad"],"mappings":"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 truncated
+1 -2
View File
@@ -312,5 +312,4 @@ export default class QrScanner {
}
}
QrScanner.DEFAULT_CANVAS_SIZE = 400;
QrScanner.WORKER_PATH = '/libraries/qr-scanner/qr-scanner-worker.min.js';
/** @preserve @asset(/libraries/qr-scanner/qr-scanner-worker.min.js) */
QrScanner.WORKER_PATH = 'qr-scanner-worker.min.js';