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

Add qr code to wallet secret and qr scanner at join page

Browse source
This commit is contained in:
Yemel Jardi 2014-07-30 02:55:59 -03:00
commit 45f4352ec4
6 changed files with 146 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/controllers/send.js
View file

@ -30,10 +30,6 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.amount = amount;
}
// Detect protocol
$scope.isHttp = ($window.location.protocol.indexOf('http') === 0);
$scope.isCordova = typeof(window.cordova) != 'undefined';
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
$scope.isMobile = isMobile.any();
@ -171,6 +167,8 @@ angular.module('copayApp.controllers').controller('SendController',
};
$scope.openScanner = function() {
if (window.cordova) return $scope.scannerIntent();
$scope.showScanner = true;
// Wait a moment until the canvas shows