fix activity scroll to refresh balance

This commit is contained in:
Gabriel Bazán 2016-05-23 16:30:36 -03:00 committed by Javier
commit 5413e87f09
4 changed files with 13 additions and 56 deletions

View file

@ -32,24 +32,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
ret.sendMaxInfo = {};
var vanillaScope = ret;
$scope.collapseBalanceContent = function(updating) {
if (updating || isCordova) return;
var scrollPosition = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top;
$scope.shouldCollapse = scrollPosition > 50 ? true : false;
$timeout(function() {
$scope.$apply();
});
};
$scope.freezeScroll = function() {
var openRatio = $ionicSideMenuDelegate.getOpenRatio();
if (openRatio != 0)
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(true);
$ionicScrollDelegate.$getByHandle('transactions').freezeScroll(true);
else
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(false);
$ionicScrollDelegate.$getByHandle('transactions').freezeScroll(false);
$timeout(function() {
$scope.$apply();

View file

@ -460,14 +460,6 @@ ul.manage li {
}
}
.fade-t {
transition: top .2s ease;
}
.fade-all {
transition: .4s all ease;
}
.dn {
display: none;
}
@ -636,14 +628,6 @@ ul.manage li {
margin-top: 30%;
}
.t50 {
top: 50px;
}
.t150 {
top: 150px;
}
.m15 {
margin: 15px;
}
@ -1587,13 +1571,6 @@ input.ng-invalid-match {
margin-bottom: 25px;
}
.amount-collapsed {
width: 100%;
text-align: center;
color: #fff;
height: 50px;
}
.alternative-amount {
height: 25px;
text-align: center;
@ -1634,14 +1611,6 @@ input.ng-invalid-match {
font-size: 20px;
color: #fff;
}
.wallet-info-collapsed {
position: absolute;
top: inherit;
left: 10px;
bottom: 0px;
font-size: 20px;
color: #fff;
}
}
.camera-icon a {