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

Merge pull request #4488 from gabrielbazan7/fix/PullRefresher1

Browse source 
remove pull to refresh when side bar is open
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-22 16:03:27 -03:00 • committed by GitHub
commit 6e5911c16c
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/index.html
View file

@ -25,7 +25,7 @@
<!-- Main content --> <!-- Main content -->
<ion-side-menu-content drag-content="index.isCordova"> <ion-side-menu-content drag-content="index.isCordova && index.allowSideBar">
<div notifications="right top"></div> <div notifications="right top"></div>
<div id="sectionContainer"> <div id="sectionContainer">
<div id="mainSection"> <div id="mainSection">

5
public/views/walletHome.html
View file

@ -35,9 +35,10 @@
--> -->
<ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false" > <ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false" >
<ion-content overflow-scroll="true"> <ion-content overflow-scroll="true" on-release="index.allowSideBar = true; index.allowPullToRefresh = true;" on-drag-right="index.allowRefresher()">
<ion-refresher <ion-refresher
ng-if="index.isCordova" ng-if="index.allowPullToRefresh && index.isCordova"
on-pulling="index.allowSideBar = false"
pulling-icon="ion-ios-refresh" pulling-icon="ion-ios-refresh"
spinner="ios-small" spinner="ios-small"
on-refresh="index.updateAll({triggerTxUpdate: true})"> on-refresh="index.updateAll({triggerTxUpdate: true})">

6
src/js/controllers/index.js
View file

@ -1,6 +1,6 @@
'use strict'; '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 self = this;
var SOFT_CONFIRMATION_LIMIT = 12; var SOFT_CONFIRMATION_LIMIT = 12;
var errors = bwcService.getErrors(); var errors = bwcService.getErrors();
@ -68,6 +68,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
go.walletHome(); go.walletHome();
}; };
self.allowRefresher = function() {
if ($ionicSideMenuDelegate.getOpenRatio() != 0) self.allowPullToRefresh = false;
}
self.hideBalance = function() { self.hideBalance = function() {
storageService.getHideBalanceFlag(self.walletId, function(err, shouldHideBalance) { storageService.getHideBalanceFlag(self.walletId, function(err, shouldHideBalance) {
if (err) self.shouldHideBalance = false; if (err) self.shouldHideBalance = false;