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

Removes hasClick

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-02-20 11:56:11 -03:00
commit ae63ae145d
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/modals/txpDetails.js
View file

@ -14,7 +14,6 @@ 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($scope.tx.amountStr); $scope.displayAmount = getDisplayAmount($scope.tx.amountStr);
$scope.displayUnit = getDisplayUnit($scope.tx.amountStr); $scope.displayUnit = getDisplayUnit($scope.tx.amountStr);
initActionList(); initActionList();

16
src/js/services/platformInfo.js
View file

@ -39,21 +39,5 @@ 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;
}); });

4
www/views/modals/txp-details.html
View file

@ -163,13 +163,13 @@
<click-to-accept <click-to-accept
ng-click="onConfirm(statusChangeHandler)" ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick" ng-if="tx.pendingForUs && canSign && !paymentExpired && !isCordova"
click-send-status="sendStatus" click-send-status="sendStatus"
has-wallet-chosen="true"> has-wallet-chosen="true">
{{buttonText}} {{buttonText}}
</click-to-accept> </click-to-accept>
<slide-to-accept <slide-to-accept
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick" ng-if="tx.pendingForUs && canSign && !paymentExpired && isCordova"
slide-on-confirm="onConfirm()" slide-on-confirm="onConfirm()"
slide-send-status="sendStatus" slide-send-status="sendStatus"
has-wallet-chosen="true"> has-wallet-chosen="true">