Fixed file-input example; fixed styling

This commit is contained in:
Christoph Oberhofer
2016-07-17 22:27:59 +02:00
parent cb8502da30
commit e42fc6d221
6 changed files with 68 additions and 41 deletions
+7 -2
View File
@@ -68,8 +68,13 @@ export default {
}
_canvas.ctx.pattern = _canvas.dom.pattern.getContext("2d");
_canvas.dom.overlay = document.querySelector("canvas.drawingBuffer");
if (_canvas.dom.overlay) {
if ($debug) {
_canvas.dom.overlay = document.querySelector("canvas.drawingBuffer");
if (!_canvas.dom.overlay) {
_canvas.dom.overlay = document.createElement("canvas");
_canvas.dom.overlay.className = "drawingBuffer";
$debug.appendChild(_canvas.dom.overlay);
}
_canvas.ctx.overlay = _canvas.dom.overlay.getContext("2d");
}
}
+1 -1
View File
@@ -73,7 +73,7 @@ function fromConfig(config) {
scanner.registerResultCollector(resultCollector);
},
getCanvas() {
return scanner.canvas;
return scanner.canvas.dom.image;
},
};
}
+2 -16
View File
@@ -20,12 +20,10 @@ function createScanner() {
_stopped,
_canvasContainer = {
ctx: {
image: null,
overlay: null
image: null
},
dom: {
image: null,
overlay: null
image: null
}
},
_inputImageWrapper,
@@ -117,18 +115,6 @@ function createScanner() {
_canvasContainer.ctx.image = _canvasContainer.dom.image.getContext("2d");
_canvasContainer.dom.image.width = _inputStream.getCanvasSize().x;
_canvasContainer.dom.image.height = _inputStream.getCanvasSize().y;
_canvasContainer.dom.overlay = document.querySelector("canvas.drawingBuffer");
if (!_canvasContainer.dom.overlay) {
_canvasContainer.dom.overlay = document.createElement("canvas");
_canvasContainer.dom.overlay.className = "drawingBuffer";
if ($viewport) {
$viewport.appendChild(_canvasContainer.dom.overlay);
}
}
_canvasContainer.ctx.overlay = _canvasContainer.dom.overlay.getContext("2d");
_canvasContainer.dom.overlay.width = _inputStream.getCanvasSize().x;
_canvasContainer.dom.overlay.height = _inputStream.getCanvasSize().y;
}
}