From ff0452444422760f38043fb54bebc22597742863 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 18 May 2015 12:43:15 -0300 Subject: [PATCH] fix setTab after some animations --- src/js/routes.js | 5 ++--- src/js/services/go.js | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index 6c0c21f04..b407bc0e4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -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; } } diff --git a/src/js/services/go.js b/src/js/services/go.js index e3b75dc54..d9fd0a4b3 100644 --- a/src/js/services/go.js +++ b/src/js/services/go.js @@ -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(); };