anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fixed

Browse source
This commit is contained in:
Matias Pando 2014-09-13 08:46:55 -03:00
commit a599251b39
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/controllers/join.js
View file

@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('JoinController',
$scope.loading = false;
$scope.isMobile = !!window.cordova;
// QR code Scanner
// QR code Scanner
var cameraInput;
var video;
var canvas;
@ -15,14 +15,13 @@ angular.module('copayApp.controllers').controller('JoinController',
var context;
var localMediaStream;
$scope.hideAdv=true;
$scope.hideAdv = true;
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
if (!window.cordova && !navigator.getUserMedia)
$scope.disableScanner =1;
if (!window.cordova && !navigator.getUserMedia)
$scope.disableScanner = 1;
var _scan = function(evt) {
if (localMediaStream) {