summaryrefslogtreecommitdiff
path: root/www/js/ModalCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/ModalCtrl.js')
-rw-r--r--www/js/ModalCtrl.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index 1384b519..cdc7af85 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -399,14 +399,18 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
function outWithOld()
{
- element.removeClass(slideout);
+
$scope.rand = Math.floor((Math.random() * 100000) + 1);
$scope.animationInProgress = true;
- element.addClass(slidein)
+ $timeout (function()
+ {
+ element.removeClass(slideout);
+ element.addClass(slidein)
.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', inWithNew );
- $scope.monitorId = mid;
- $scope.monitorName = ZMDataModel.getMonitorName(mid);
+ $scope.monitorId = mid;
+ $scope.monitorName = ZMDataModel.getMonitorName(mid);
+ },200);
}
function inWithNew()