Cancel scanning; improving start/stop behavior

This commit is contained in:
Christoph Oberhofer
2017-04-06 16:10:52 +02:00
parent 255e5a6937
commit efb3b6c5bc
7 changed files with 116 additions and 121 deletions
+2 -1
View File
@@ -48,6 +48,7 @@
}
.overlay {
display: none;
overflow: hidden;
position: fixed;
top: 0;
@@ -58,7 +59,7 @@
background-color: rgba(0, 0, 0, 0.3);
}
.overlay__content {
.overlay__container {
top: 50%;
position: absolute;
left: 50%;
+44 -51
View File
@@ -52,22 +52,24 @@ var App = {
_scanner: null,
init: function() {
this.attachListeners();
this._overlay = document.querySelector('.overlay');
},
activateScanner: function() {
var scanner = this.configureScanner('.overlay__content'),
onDetected = function (result) {
document.querySelector('input.isbn').value = result.codeResult.code;
stop();
}.bind(this),
stop = function() {
scanner.stop(); // should also clear all event-listeners?
scanner.removeEventListener('detected', onDetected);
this.hideOverlay();
this.attachListeners();
}.bind(this);
this.showOverlay(stop);
scanner.addEventListener('detected', onDetected).start();
this.configureScanner('.overlay__content')
.then(function(scanner) {
this.showOverlay(scanner.stop.bind(scanner));
return scanner.detect();
}.bind(this))
.then(function(result) {
document.querySelector('input.isbn').value = result.codeResult.code;
})
.catch((e) => {
console.log(e);
})
.then(function() {
this.hideOverlay();
this.attachListeners();
}.bind(this));
},
attachListeners: function() {
var self = this,
@@ -80,29 +82,11 @@ var App = {
});
},
showOverlay: function(cancelCb) {
if (!this._overlay) {
var content = document.createElement('div'),
closeButton = document.createElement('div');
closeButton.appendChild(document.createTextNode('X'));
content.className = 'overlay__content';
closeButton.className = 'overlay__close';
this._overlay = document.createElement('div');
this._overlay.className = 'overlay';
this._overlay.appendChild(content);
content.appendChild(closeButton);
closeButton.addEventListener('click', function closeClick() {
closeButton.removeEventListener('click', closeClick);
cancelCb();
});
document.body.appendChild(this._overlay);
} else {
var closeButton = document.querySelector('.overlay__close');
closeButton.addEventListener('click', function closeClick() {
closeButton.removeEventListener('click', closeClick);
cancelCb();
});
}
var closeButton = document.querySelector('.overlay__close');
closeButton.addEventListener('click', function closeClick() {
closeButton.removeEventListener('click', closeClick);
cancelCb();
});
this._overlay.style.display = "block";
},
hideOverlay: function() {
@@ -111,20 +95,18 @@ var App = {
}
},
configureScanner: function(selector) {
if (!this._scanner) {
this._scanner = Quagga
.decoder({readers: ['ean_reader']})
.locator({patchSize: 'medium'})
.fromVideo({
target: selector,
constraints: {
width: 800,
height: 600,
facingMode: "environment"
}
});
if (this._scanner) {
return Promise.resolve(this._scanner);
}
return this._scanner;
return Quagga.fromCamera({
decoder: {readers: ['ean_reader']},
target: selector,
})
.then((scanner) => {
this._scanner = scanner;
return scanner;
});
}
};
App.init();
@@ -141,6 +123,12 @@ App.init();
<button type="button" class="icon-barcode button scan"> </button>
</div>
</form>
<div class="overlay">
<div class="overlay__container">
<div class="overlay__close">X</div>
<div class="overlay__content" />
</div>
</div>
</code>
</pre>
</div>
@@ -151,7 +139,12 @@ App.init();
&copy; Copyright by Christoph Oberhofer
</p>
</footer>
<div class="overlay">
<div class="overlay__container">
<div class="overlay__close">X</div>
<div class="overlay__content" />
</div>
</div>
<script src="//webrtc.github.io/adapter/adapter-latest.js" type="text/javascript"></script>
<script src="../../dist/quagga.js" type="text/javascript"></script>
<script src="index.js" type="text/javascript"></script>
+32 -50
View File
@@ -3,22 +3,24 @@ var App = {
_scanner: null,
init: function() {
this.attachListeners();
this._overlay = document.querySelector('.overlay');
},
activateScanner: function() {
var scanner = this.configureScanner('.overlay__content'),
onDetected = function (result) {
document.querySelector('input.isbn').value = result.codeResult.code;
stop();
}.bind(this),
stop = function() {
scanner.stop(); // should also clear all event-listeners?
scanner.removeEventListener('detected', onDetected);
this.hideOverlay();
this.attachListeners();
}.bind(this);
this.showOverlay(stop);
scanner.addEventListener('detected', onDetected).start();
this.configureScanner('.overlay__content')
.then(function(scanner) {
this.showOverlay(scanner.stop.bind(scanner));
return scanner.detect();
}.bind(this))
.then(function(result) {
document.querySelector('input.isbn').value = result.codeResult.code;
})
.catch((e) => {
console.log(e);
})
.then(function() {
this.hideOverlay();
this.attachListeners();
}.bind(this));
},
attachListeners: function() {
var self = this,
@@ -31,29 +33,11 @@ var App = {
});
},
showOverlay: function(cancelCb) {
if (!this._overlay) {
var content = document.createElement('div'),
closeButton = document.createElement('div');
closeButton.appendChild(document.createTextNode('X'));
content.className = 'overlay__content';
closeButton.className = 'overlay__close';
this._overlay = document.createElement('div');
this._overlay.className = 'overlay';
this._overlay.appendChild(content);
content.appendChild(closeButton);
closeButton.addEventListener('click', function closeClick() {
closeButton.removeEventListener('click', closeClick);
cancelCb();
});
document.body.appendChild(this._overlay);
} else {
var closeButton = document.querySelector('.overlay__close');
closeButton.addEventListener('click', function closeClick() {
closeButton.removeEventListener('click', closeClick);
cancelCb();
});
}
var closeButton = document.querySelector('.overlay__close');
closeButton.addEventListener('click', function closeClick() {
closeButton.removeEventListener('click', closeClick);
cancelCb();
});
this._overlay.style.display = "block";
},
hideOverlay: function() {
@@ -62,20 +46,18 @@ var App = {
}
},
configureScanner: function(selector) {
if (!this._scanner) {
this._scanner = Quagga
.decoder({readers: ['ean_reader']})
.locator({patchSize: 'medium'})
.fromSource({
target: selector,
constraints: {
width: 800,
height: 600,
facingMode: "environment"
}
});
if (this._scanner) {
return Promise.resolve(this._scanner);
}
return this._scanner;
return Quagga.fromCamera({
decoder: {readers: ['ean_reader']},
target: selector,
})
.then((scanner) => {
this._scanner = scanner;
return scanner;
});
}
};
App.init();