From 3b82e939beb7bd2cdbee8727c1ca3690ba10a3b0 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Thu, 21 Apr 2016 15:20:49 -0400
Subject: make sure you can't drag menu when scrub is on

Former-commit-id: 1e94e40a171c68cafe726889fcd6fec86531604e
---
 www/js/EventCtrl.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'www/js/EventCtrl.js')

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,
-- 
cgit v1.2.3