diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/ModalCtrl.js | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 589a565b..47aa629c 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1270,6 +1270,7 @@ angular.module('zmApp.controllers') $scope.currentEvent = event; $scope.followSameMonitor = ($stateParams.id == "0")?"0":"1"; + // prepareModalEvent(event.Event.Id); diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index b2299068..349a2ddc 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -554,6 +554,7 @@ $scope.togglePresets = function() ZMDataModel.zmLog ("New image loaded in"); var ld = ZMDataModel.getLogin(); + carouselUtils.setStop(false); if (ld.useNphZms == true) { $scope.currentStreamMode = 'single'; @@ -898,6 +899,7 @@ $scope.togglePresets = function() { element.removeClass(slidein); $scope.animationInProgress = false; + carouselUtils.setStop(false); } } |