summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/EventCtrl.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 98349fdb..6bb83bd2 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -670,6 +670,7 @@ angular.module('zmApp.controllers')
if (event.Event.ShowScrub == true) // turn on display now
{
+
if (groupType == 'alarms')
{
$scope.alarm_images=[];
@@ -713,7 +714,7 @@ angular.module('zmApp.controllers')
$scope.currentEvent = "";
$scope.event = event;
//$ionicScrollDelegate.freezeScroll(true);
- $ionicSideMenuDelegate.canDragContent(true);
+ $ionicSideMenuDelegate.canDragContent(false);
$scope.slider_options = {
from: 1,
to: event.Event.Frames,