mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #2743 from matiu/bug/refresh
fix setTab after some animations
This commit is contained in:
commit
876ae63a25
|
@ -462,7 +462,6 @@ angular
|
|||
e2.addEventListener("animationend", cleanUp, true);
|
||||
e.addEventListener("webkitAnimationEnd", cleanUp, true);
|
||||
e2.addEventListener("webkitAnimationEnd", cleanUp, true);
|
||||
// TODO
|
||||
timeoutID = setTimeout(cleanUp, 500);
|
||||
};
|
||||
|
||||
|
@ -520,7 +519,7 @@ angular
|
|||
e.className = entering || '';
|
||||
cachedBackPanel.className = leaving || '';
|
||||
cleanUpLater(e, cachedBackPanel);
|
||||
console.log('USing', cachedTransitionState); //TODO
|
||||
//console.log('USing animation', cachedTransitionState);
|
||||
return true;
|
||||
} else {
|
||||
var sc;
|
||||
|
@ -538,7 +537,7 @@ angular
|
|||
cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc;
|
||||
|
||||
cachedTransitionState = desiredTransitionState;
|
||||
console.log('CACHing', cachedTransitionState); //TODO
|
||||
//console.log('CACHing animation', cachedTransitionState);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,6 +37,8 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
|
|||
$state.transitionTo(path)
|
||||
.then(function() {
|
||||
if (cb) return cb();
|
||||
}, function() {
|
||||
if (cb) return cb('animation in progress');
|
||||
});
|
||||
hideSidebars();
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue