animated screens as well

1 files changed, 5 insertions, 6 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index df63ed16..00bec5d3 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -16,7 +16,7 @@ angular.module('zmApp.controllers')
         // Controller main
         //---------------------------------------------------
 
-
+        $scope.animationInProgress = false;
         var loginData = ZMDataModel.getLogin();
 
         $scope.hours = [];
@@ -1170,26 +1170,25 @@ angular.module('zmApp.controllers')
             var element = angular.element(document.getElementById("full-screen-event"));
             element.addClass(slideout).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', outWithOld);
             
+            
+            
             function outWithOld()
             {
                 element.removeClass(slideout);
                 prepareModalEvent(eid);
+                $scope.animationInProgress = true;
                 element.addClass(slidein).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', inWithNew );
             }
             
             function inWithNew()
             {
                 element.removeClass(slidein);
+                $scope.animationInProgress = false;
             }
 
 
         };
         
-        
-        
-        
-
-        
         //--------------------------------------------------------
         // utility function
         //--------------------------------------------------------