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

Merge pull request #452 from gabrielbazan7/fix/pulltorefresh

Browse source 
Fix/pulltorefresh
This commit is contained in:
Matias Alejo Garcia 2016-10-14 13:05:12 -03:00 • committed by GitHub
commit 79dbcf88d5
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/tab-home.js
View file

@ -11,6 +11,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$scope.name = $window.appConfig.nameCase; $scope.name = $window.appConfig.nameCase;
$scope.homeTip = $stateParams.fromOnboarding; $scope.homeTip = $stateParams.fromOnboarding;
$scope.isCordova = platformInfo.isCordova; $scope.isCordova = platformInfo.isCordova;
$scope.isAndroid = platformInfo.isAndroid;
$scope.$on("$ionicView.afterEnter", function() { $scope.$on("$ionicView.afterEnter", function() {
startupService.ready(); startupService.ready();
@ -221,7 +222,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}; };
$scope.onRefresh = function() { $scope.onRefresh = function() {
$scope.$broadcast('scroll.refreshComplete'); $timeout(function() {
$scope.$broadcast('scroll.refreshComplete');
}, 300);
updateAllWallets(); updateAllWallets();
}; };

5
src/js/controllers/walletDetails.js
View file

@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.completeTxHistory = []; $scope.completeTxHistory = [];
$scope.openTxpModal = txpModalService.open; $scope.openTxpModal = txpModalService.open;
$scope.isCordova = platformInfo.isCordova; $scope.isCordova = platformInfo.isCordova;
$scope.isAndroid = platformInfo.isAndroid;
$scope.openExternalLink = function(url, target) { $scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target); externalLinkService.open(url, target);
@ -161,7 +162,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}; };
$scope.onRefresh = function() { $scope.onRefresh = function() {
$scope.$broadcast('scroll.refreshComplete'); $timeout(function() {
$scope.$broadcast('scroll.refreshComplete');
}, 300);
$scope.updateAll(true); $scope.updateAll(true);
}; };

2
www/views/tab-home.html
View file

@ -5,7 +5,7 @@
<ion-content class="padding"> <ion-content class="padding">
<ion-refresher <ion-refresher
ng-if="isCordova" ng-if="isAndroid"
pulling-icon="ion-ios-refresh" pulling-icon="ion-ios-refresh"
spinner="ios-small" spinner="ios-small"
on-refresh="onRefresh()"> on-refresh="onRefresh()">

2
www/views/walletDetails.html
View file

@ -12,7 +12,7 @@
<ion-content has-bouncing="false"> <ion-content has-bouncing="false">
<ion-refresher <ion-refresher
ng-if="isCordova" ng-if="isAndroid"
pulling-icon="ion-ios-refresh" pulling-icon="ion-ios-refresh"
spinner="ios-small" spinner="ios-small"
on-refresh="onRefresh()"> on-refresh="onRefresh()">