summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-11-05 16:09:10 -0500
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-11-05 16:09:10 -0500
commit3f25b22a9332851268906d8c14b199640e94e48d (patch)
tree5334422cd078dffde6b2fb5832b03eecbcc382f7 /www/js/EventCtrl.js
parent2ac2150dc0fa6733082babc6971383b35835971f (diff)
transition fixex
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 71bf6b27..cbf0329e 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1302,10 +1302,18 @@ angular.module('zmApp.controllers')
function outWithOld()
{
- element.removeClass(slideout);
- prepareModalEvent(eid);
+
+
$scope.animationInProgress = true;
- element.addClass(slidein).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', inWithNew );
+ // give digest time for image to swap
+ // 100 should be enough
+ $timeout(function()
+ {
+ element.removeClass(slideout);
+ element.addClass(slidein)
+ .one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', inWithNew );
+ prepareModalEvent(eid);
+ },200);
}
function inWithNew()