diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 7cbfe4d80..f7199c1e9 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -588,7 +588,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/Offline', function(event) { $log.debug('### Offline event'); if (!self.offLineSince) self.offLineSince = Date.now(); - if (Date.now() - sef.offLineSince > 1000) { + + if (Date.now() - self.offLineSince > 10000) { self.isOffline = true; $timeout(function() { $rootScope.$apply(); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c130d11fe..c229c7ab1 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -48,16 +48,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var disableOnlineListener = $rootScope.$on('Local/Online', function() { // This is needed then the apps go to sleep - $timeout(function() { - self.bindTouchDown(); - }, 2000); + self.bindTouchDown(); }); var disableResumeListener = $rootScope.$on('Local/Resume', function() { // This is needed then the apps go to sleep - $timeout(function() { - self.bindTouchDown(); - }, 2000); + self.bindTouchDown(); }); @@ -391,8 +387,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi ['hamburger', 'menu-walletHome', 'menu-send', 'menu-receive', 'menu-history'].forEach(function(id) { var e = document.getElementById(id); if (e) e.addEventListener('touchstart', function() { + try { + event.preventDefault(); + } catch (e) {}; angular.element(e).triggerHandler('click'); - }); + }, true); }); } diff --git a/src/js/directives/ngSwipe.js b/src/js/directives/ngSwipe.js index 1ac4203e9..9b9343038 100644 --- a/src/js/directives/ngSwipe.js +++ b/src/js/directives/ngSwipe.js @@ -12,9 +12,9 @@ function makeSwipeDirective(directiveName, direction, eventName) { // The maximum vertical delta for a swipe should be less than 75px. var MAX_VERTICAL_DISTANCE = 75; // Vertical distance should not be more than a fraction of the horizontal distance. - var MAX_VERTICAL_RATIO = 0.3; + var MAX_VERTICAL_RATIO = 0.4; // At least a 30px lateral motion is necessary for a swipe. - var MIN_HORIZONTAL_DISTANCE = 25; + var MIN_HORIZONTAL_DISTANCE = 30; return function(scope, element, attr) { var swipeHandler = $parse(attr[directiveName]);