From 4052570bb7eb74baf69c7a656029abd662524923 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Wed, 20 Jan 2016 04:49:16 -0500
Subject: event playback - autostart on slide

Former-commit-id: 17c87cc2c11901d11d1a7a38333ccf211daa8b71
---
 www/js/EventCtrl.js | 1 +
 www/js/ModalCtrl.js | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'www/js')

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);
             }
 
         }
-- 
cgit v1.2.3