actual changes have been ignored unintentionally

This commit is contained in:
David Madner
2016-02-07 16:52:57 +01:00
parent 893a3bc30d
commit 3c85675fbf
4 changed files with 59 additions and 17 deletions
+18 -4
View File
@@ -47,7 +47,9 @@ function initInputStream(cb) {
} else if (_config.inputStream.type === "ImageStream") {
_inputStream = InputStream.createImageStream();
} else if (_config.inputStream.type === "LiveStream") {
var $viewport = document.querySelector("#interactive.viewport");
var $viewport = getViewPort(_config);
if ($viewport) {
video = $viewport.querySelector("video");
if (!video) {
@@ -71,9 +73,21 @@ function initInputStream(cb) {
_inputStream.addEventListener("canrecord", canRecord.bind(undefined, cb));
}
function getViewPort(_config) {
var target = _config.inputStream.target;
// Check if target is already a DOM element
if(target && target.nodeName && target.nodeType === 1) {
return target;
} else {
// Use '#interactive.viewport' as a fallback selector (backwards compatibility)
var selector = typeof target === 'string' ? target : '#interactive.viewport';
return document.querySelector(selector);
}
}
function canRecord(cb) {
BarcodeLocator.checkImageConstraints(_inputStream, _config.locator);
initCanvas();
initCanvas(_config);
_framegrabber = FrameGrabber.create(_inputStream, _canvasContainer.dom.image);
if (_config.numOfWorkers > 0) {
@@ -92,9 +106,9 @@ function ready(cb){
cb();
}
function initCanvas() {
function initCanvas(_config) {
if (typeof document !== "undefined") {
var $viewport = document.querySelector("#interactive.viewport");
var $viewport = getViewPort(_config);
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
if (!_canvasContainer.dom.image) {
_canvasContainer.dom.image = document.createElement("canvas");