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

Merge pull request #2743 from matiu/bug/refresh

Browse source 
fix setTab after some animations
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-18 14:18:59 -03:00
commit 876ae63a25
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/routes.js
View file

@ -462,7 +462,6 @@ angular
e2.addEventListener("animationend", cleanUp, true); e2.addEventListener("animationend", cleanUp, true);
e.addEventListener("webkitAnimationEnd", cleanUp, true); e.addEventListener("webkitAnimationEnd", cleanUp, true);
e2.addEventListener("webkitAnimationEnd", cleanUp, true); e2.addEventListener("webkitAnimationEnd", cleanUp, true);
// TODO
timeoutID = setTimeout(cleanUp, 500); timeoutID = setTimeout(cleanUp, 500);
}; };
@ -520,7 +519,7 @@ angular
e.className = entering || ''; e.className = entering || '';
cachedBackPanel.className = leaving || ''; cachedBackPanel.className = leaving || '';
cleanUpLater(e, cachedBackPanel); cleanUpLater(e, cachedBackPanel);
console.log('USing', cachedTransitionState); //TODO //console.log('USing animation', cachedTransitionState);
return true; return true;
} else { } else {
var sc; var sc;
@ -538,7 +537,7 @@ angular
cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc; cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc;
cachedTransitionState = desiredTransitionState; cachedTransitionState = desiredTransitionState;
console.log('CACHing', cachedTransitionState); //TODO //console.log('CACHing animation', cachedTransitionState);
return false; return false;
} }
} }

2
src/js/services/go.js
View file

@ -37,6 +37,8 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
$state.transitionTo(path) $state.transitionTo(path)
.then(function() { .then(function() {
if (cb) return cb(); if (cb) return cb();
}, function() {
if (cb) return cb('animation in progress');
}); });
hideSidebars(); hideSidebars();
}; };