mirror of https://github.com/BTCPrivate/copay.git
adding has click
This commit is contained in:
parent
5b61a17cb5
commit
3d5522b227
|
@ -32,6 +32,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
throw ('bad params');
|
throw ('bad params');
|
||||||
}
|
}
|
||||||
$scope.isCordova = platformInfo.isCordova;
|
$scope.isCordova = platformInfo.isCordova;
|
||||||
|
$scope.hasClick = platformInfo.hasClick;
|
||||||
$scope.data = {};
|
$scope.data = {};
|
||||||
|
|
||||||
var config = configService.getSync().wallet;
|
var config = configService.getSync().wallet;
|
||||||
|
|
|
@ -17,6 +17,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
$scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
|
$scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
|
||||||
$scope.color = $scope.wallet.color;
|
$scope.color = $scope.wallet.color;
|
||||||
$scope.data = {};
|
$scope.data = {};
|
||||||
|
$scope.hasClick = platformInfo.hasClick;
|
||||||
$scope.displayAmount = getDisplayAmount(tx.amountStr);
|
$scope.displayAmount = getDisplayAmount(tx.amountStr);
|
||||||
$scope.displayUnit = getDisplayUnit(tx.amountStr);
|
$scope.displayUnit = getDisplayUnit(tx.amountStr);
|
||||||
initActionList();
|
initActionList();
|
||||||
|
|
|
@ -39,5 +39,21 @@ angular.module('copayApp.services').factory('platformInfo', function($window) {
|
||||||
ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW;
|
ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW;
|
||||||
ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW;
|
ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW;
|
||||||
|
|
||||||
|
ret.hasClick = false;
|
||||||
|
|
||||||
|
if ($window.sessionStorage.getItem('hasClick')) {
|
||||||
|
ret.hasClick = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$window.addEventListener('mousedown', function() {
|
||||||
|
ret.hasClick = true;
|
||||||
|
$window.sessionStorage.setItem('hasClick', 'true');
|
||||||
|
});
|
||||||
|
|
||||||
|
$window.addEventListener('touchstart', function() {
|
||||||
|
ret.hasClick = false;
|
||||||
|
$window.sessionStorage.removeItem('hasClick');
|
||||||
|
});
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
});
|
});
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
</ion-nav-back-button>
|
</ion-nav-back-button>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
||||||
<ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds}">
|
<ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds}">
|
||||||
<div class="list">
|
<div class="list">
|
||||||
<div class="item head">
|
<div class="item head">
|
||||||
<div class="sending-label">
|
<div class="sending-label">
|
||||||
|
@ -59,13 +59,13 @@
|
||||||
</div>
|
</div>
|
||||||
<click-to-accept
|
<click-to-accept
|
||||||
ng-click="approve(statusChangeHandler)"
|
ng-click="approve(statusChangeHandler)"
|
||||||
ng-if="!isCordova && wallets[0]"
|
ng-if="hasClick && wallets[0]"
|
||||||
click-send-status="sendStatus">
|
click-send-status="sendStatus">
|
||||||
Click to pay
|
Click to pay
|
||||||
</click-to-accept>
|
</click-to-accept>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
<slide-to-accept
|
<slide-to-accept
|
||||||
ng-if="isCordova && wallets[0]"
|
ng-if="!hasClick && wallets[0]"
|
||||||
slide-on-confirm="onConfirm()"
|
slide-on-confirm="onConfirm()"
|
||||||
slide-send-status="sendStatus">
|
slide-send-status="sendStatus">
|
||||||
Slide to pay
|
Slide to pay
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
</button>
|
</button>
|
||||||
</ion-header-bar>
|
</ion-header-bar>
|
||||||
|
|
||||||
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && isCordova}">
|
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && !hasClick}">
|
||||||
<div class="list">
|
<div class="list">
|
||||||
<div class="item head">
|
<div class="item head">
|
||||||
<div class="sending-label">
|
<div class="sending-label">
|
||||||
|
@ -152,7 +152,7 @@
|
||||||
|
|
||||||
<click-to-accept
|
<click-to-accept
|
||||||
ng-click="onConfirm(statusChangeHandler)"
|
ng-click="onConfirm(statusChangeHandler)"
|
||||||
ng-if="tx.pendingForUs && canSign && !paymentExpired && !isCordova"
|
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
|
||||||
click-send-status="sendStatus">
|
click-send-status="sendStatus">
|
||||||
Click to accept
|
Click to accept
|
||||||
</click-to-accept>
|
</click-to-accept>
|
||||||
|
@ -168,7 +168,7 @@
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|
||||||
<slide-to-accept
|
<slide-to-accept
|
||||||
ng-if="tx.pendingForUs && canSign && !paymentExpired && isCordova"
|
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
|
||||||
slide-on-confirm="onConfirm()"
|
slide-on-confirm="onConfirm()"
|
||||||
slide-send-status="sendStatus">
|
slide-send-status="sendStatus">
|
||||||
Slide to accept
|
Slide to accept
|
||||||
|
|
Loading…
Reference in New Issue