From 73634f125fb0994b1c7fc67601e62f85c1c18b7b Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 8 May 2015 11:38:34 -0300 Subject: [PATCH] update balance later --- src/css/mobile.css | 4 ++-- src/js/controllers/walletHome.js | 9 +++++---- src/js/routes.js | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index 4cf82c6aa..3b6c6a7b6 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -405,12 +405,12 @@ to prevent collapsing during animation*/ left: 0; right: 0; - animation-timing-function: ease-in-out; + animation-timing-function: linear; animation-duration: .4s; animation-iteration-count: 1; animation-fill-mode: both; - -webkit-animation-timing-function: ease-in-out; + -webkit-animation-timing-function: linear; -webkit-animation-duration: .4s; -webkit-animation-iteration-count: 1; -webkit-animation-fill-mode: both; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index b41b11ca8..895eccb32 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -293,10 +293,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); modalInstance.result.then(function(txp) { - $scope.$emit('Local/TxProposalAction'); if (txp) { self.setOngoingProcess(); - txStatus.notify(txp); + txStatus.notify(txp, function() { + $scope.$emit('Local/TxProposalAction'); + }); } }); @@ -598,15 +599,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.$digest(); return cb(err); } - $scope.$emit('Local/TxProposalAction'); txStatus.notify(btx, function() { + $scope.$emit('Local/TxProposalAction'); return cb(); }); }); } else { self.setOngoingProcess(); - $scope.$emit('Local/TxProposalAction'); txStatus.notify(signedTx, function() { + $scope.$emit('Local/TxProposalAction'); return cb(); }); } diff --git a/src/js/routes.js b/src/js/routes.js index c1f3f8789..64b96a4a5 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -411,6 +411,10 @@ angular event.preventDefault(); } + /* + * -------------------- + */ + function animateTransition(entering, leaving) { // Animation in progress? var x = document.getElementById('mainSectionDup');