diff options
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 14 |
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() |