diff --git a/js/controllers/join.js b/js/controllers/join.js index 34d4a7231..d94c24354 100644 --- a/js/controllers/join.js +++ b/js/controllers/join.js @@ -17,8 +17,13 @@ angular.module('copayApp.controllers').controller('JoinController', $scope.hideAdv=true; + + navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia; + if (!window.cordova && !navigator.getUserMedia) + $scope.disableScanner =1; + var _scan = function(evt) { if (localMediaStream) { context.drawImage(video, 0, 0, 300, 225); diff --git a/js/controllers/send.js b/js/controllers/send.js index a3112a093..2b37844d6 100644 --- a/js/controllers/send.js +++ b/js/controllers/send.js @@ -17,6 +17,8 @@ angular.module('copayApp.controllers').controller('SendController', $scope.isRateAvailable = false; $scope.rateService = rateService; + + rateService.whenAvailable(function() { $scope.isRateAvailable = true; $scope.$digest(); @@ -101,6 +103,9 @@ angular.module('copayApp.controllers').controller('SendController', window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL; $scope.isMobile = isMobile.any(); + if (!window.cordova && !navigator.getUserMedia) + $scope.disableScanner =1; + $scope.submitForm = function(form) { if (form.$invalid) { var message = 'Unable to send transaction proposal.'; diff --git a/views/join.html b/views/join.html index b4914eb05..878118062 100644 --- a/views/join.html +++ b/views/join.html @@ -26,7 +26,7 @@ -
+
 
diff --git a/views/send.html b/views/send.html index 3345e2347..fdb5f5baf 100644 --- a/views/send.html +++ b/views/send.html @@ -26,7 +26,7 @@
-
+