From 04b093900e69a975f25b53fa7ddf654e36ce0949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 22 Jun 2016 13:00:17 -0300 Subject: [PATCH] remove pull to refresh when side bar is open --- public/index.html | 2 +- public/views/walletHome.html | 5 +++-- src/js/controllers/index.js | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/public/index.html b/public/index.html index b6bc03f2a..4fc79fa5c 100644 --- a/public/index.html +++ b/public/index.html @@ -25,7 +25,7 @@ - +
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 3fce9dd1c..8a84bc3f0 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -35,9 +35,10 @@ --> - + diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 977cba5de..e48ec5455 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, openURLService, ongoingProcess) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, $ionicSideMenuDelegate, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, openURLService, ongoingProcess) { var self = this; var SOFT_CONFIRMATION_LIMIT = 12; var errors = bwcService.getErrors(); @@ -68,6 +68,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r go.walletHome(); }; + self.allowRefresher = function() { + if ($ionicSideMenuDelegate.getOpenRatio() != 0) self.allowPullToRefresh = false; + } + self.hideBalance = function() { storageService.getHideBalanceFlag(self.walletId, function(err, shouldHideBalance) { if (err) self.shouldHideBalance = false;