From a1c73b7148f4644f0d0c3413cf08bb209b29df67 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 14:22:00 -0400 Subject: [PATCH] add hasClick to platformInfo and use it to determine whether to show the slide to pay component or not --- src/js/controllers/confirm.js | 1 + src/js/routes.js | 2 +- src/js/services/platformInfo.js | 16 ++++++++++++++++ www/views/confirm.html | 4 ++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 23440c11c..ba66bcb26 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -32,6 +32,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( throw ('bad params'); } $scope.isCordova = platformInfo.isCordova; + $scope.hasClick = platformInfo.hasClick; $scope.data = {}; var config = configService.getSync().wallet; diff --git a/src/js/routes.js b/src/js/routes.js index a69f00072..3a06302a4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -983,7 +983,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - $state.go('tabs.home'); + //$state.go('tabs.home'); } }); }); diff --git a/src/js/services/platformInfo.js b/src/js/services/platformInfo.js index f634e8f0f..9ba4a6d9f 100644 --- a/src/js/services/platformInfo.js +++ b/src/js/services/platformInfo.js @@ -39,5 +39,21 @@ angular.module('copayApp.services').factory('platformInfo', function($window) { ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !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; }); diff --git a/www/views/confirm.html b/www/views/confirm.html index 541a43d1b..127b011f0 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -59,10 +59,10 @@ - + Slide to pay