mirror of https://github.com/BTCPrivate/copay.git
commit
6a1cd3b688
|
@ -17,8 +17,13 @@ angular.module('copayApp.controllers').controller('JoinController',
|
||||||
|
|
||||||
$scope.hideAdv=true;
|
$scope.hideAdv=true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
|
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
|
||||||
|
|
||||||
|
if (!window.cordova && !navigator.getUserMedia)
|
||||||
|
$scope.disableScanner =1;
|
||||||
|
|
||||||
var _scan = function(evt) {
|
var _scan = function(evt) {
|
||||||
if (localMediaStream) {
|
if (localMediaStream) {
|
||||||
context.drawImage(video, 0, 0, 300, 225);
|
context.drawImage(video, 0, 0, 300, 225);
|
||||||
|
|
|
@ -17,6 +17,8 @@ angular.module('copayApp.controllers').controller('SendController',
|
||||||
$scope.isRateAvailable = false;
|
$scope.isRateAvailable = false;
|
||||||
$scope.rateService = rateService;
|
$scope.rateService = rateService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
rateService.whenAvailable(function() {
|
rateService.whenAvailable(function() {
|
||||||
$scope.isRateAvailable = true;
|
$scope.isRateAvailable = true;
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
|
@ -101,6 +103,9 @@ angular.module('copayApp.controllers').controller('SendController',
|
||||||
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
|
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
|
||||||
$scope.isMobile = isMobile.any();
|
$scope.isMobile = isMobile.any();
|
||||||
|
|
||||||
|
if (!window.cordova && !navigator.getUserMedia)
|
||||||
|
$scope.disableScanner =1;
|
||||||
|
|
||||||
$scope.submitForm = function(form) {
|
$scope.submitForm = function(form) {
|
||||||
if (form.$invalid) {
|
if (form.$invalid) {
|
||||||
var message = 'Unable to send transaction proposal.';
|
var message = 'Unable to send transaction proposal.';
|
||||||
|
|
|
@ -271,8 +271,8 @@ angular.module('copayApp.directives')
|
||||||
}, 1000);
|
}, 1000);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
client.on('wrongflash noflash', function() {
|
client.on('wrongflash noflash', function() {
|
||||||
|
elm.removeClass('btn-copy').html('');
|
||||||
ZeroClipboard.destroy();
|
ZeroClipboard.destroy();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
|
|
||||||
<div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
|
<div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
|
||||||
<div class="large-12 medium-12" ng-init="showAll=0">
|
<div class="large-12 medium-12" ng-init="showAll=0">
|
||||||
<div class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll" ng-click="openAddressModal(addr)">
|
<div class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
|
||||||
<div class="row collapse">
|
<div class="row collapse">
|
||||||
<div class="large-10 medium-9 small-8 column" >
|
<div class="large-10 medium-9 small-8 column" >
|
||||||
<div class="ellipsis list-addr">
|
<div class="ellipsis list-addr">
|
||||||
<i class="fi-thumbnails size-48 show-for-large-up"> </i>
|
<i class="fi-thumbnails size-48 show-for-large-up" ng-click="openAddressModal(addr)"> </i>
|
||||||
<span>
|
<span>
|
||||||
<contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
<contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<input id="connectionId" type="text" class="small-9 columns"
|
<input id="connectionId" type="text" class="small-9 columns"
|
||||||
placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
|
placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-hide="showScanner">
|
<div class="small-2 columns" ng-hide="disableScanner" ng-hide="showScanner">
|
||||||
<a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera"> </i></a>
|
<a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera"> </i></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-show="showScanner">
|
<div class="small-2 columns" ng-show="showScanner">
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
|
<small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
|
||||||
<small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
|
<small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-hide="showScanner">
|
<div class="small-2 columns" ng-hide="disableScanner" ng-hide="showScanner">
|
||||||
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"></i></a>
|
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"></i></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-show="showScanner">
|
<div class="small-2 columns" ng-show="showScanner">
|
||||||
|
|
Loading…
Reference in New Issue