Updated to 0.6.12

This commit is contained in:
Christoph Oberhofer
2015-07-06 22:48:22 +02:00
parent 681c351020
commit 4234797ead
4 changed files with 38 additions and 17 deletions
+12 -8
View File
@@ -8187,11 +8187,15 @@ define('camera_access',["html_utils"], function(HtmlUtils) {
* @param {Object} failure Callback
*/
function getUserMedia(constraints, success, failure) {
navigator.getUserMedia(constraints, function(stream) {
streamRef = stream;
var videoSrc = (window.URL && window.URL.createObjectURL(stream)) || stream;
success.apply(null, [videoSrc]);
}, failure);
if (typeof navigator.getUserMedia !== 'undefined') {
navigator.getUserMedia(constraints, function (stream) {
streamRef = stream;
var videoSrc = (window.URL && window.URL.createObjectURL(stream)) || stream;
success.apply(null, [videoSrc]);
}, failure);
} else {
failure(new TypeError("getUserMedia not available"));
}
}
function loadedData(video, callback) {
@@ -8230,7 +8234,7 @@ define('camera_access',["html_utils"], function(HtmlUtils) {
video.addEventListener('loadeddata', loadedDataHandler, false);
video.play();
}, function(e) {
console.log(e);
callback(e);
});
}
@@ -8253,7 +8257,7 @@ define('camera_access',["html_utils"], function(HtmlUtils) {
facing: "environment"
}, config);
if ( typeof MediaStreamTrack.getSources !== 'undefined') {
if ( typeof MediaStreamTrack !== 'undefined' && typeof MediaStreamTrack.getSources !== 'undefined') {
MediaStreamTrack.getSources(function(sourceInfos) {
var videoSourceId;
for (var i = 0; i != sourceInfos.length; ++i) {
@@ -8473,7 +8477,7 @@ function(Code128Reader,
if (!err) {
_inputStream.trigger("canrecord");
} else {
console.log(err);
return cb(err);
}
});
}
+2 -2
View File
File diff suppressed because one or more lines are too long
+5 -1
View File
@@ -1,7 +1,11 @@
$(function() {
var App = {
init : function() {
Quagga.init(this.state, function() {
Quagga.init(this.state, function(err) {
if (err) {
console.log(err);
return;
}
App.attachListeners();
Quagga.start();
});