diff options
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 3c150d79..df63ed16 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1168,11 +1168,26 @@ angular.module('zmApp.controllers') slidein = "animated slideInLeft"; } var element = angular.element(document.getElementById("full-screen-event")); - element.addClass(slideout).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function () {element.removeClass(slideout);prepareModalEvent(eid); element.addClass(slidein); }); + element.addClass(slideout).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', outWithOld); + function outWithOld() + { + element.removeClass(slideout); + prepareModalEvent(eid); + element.addClass(slidein).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', inWithNew ); + } + + function inWithNew() + { + element.removeClass(slidein); + } }; + + + + //-------------------------------------------------------- |