From 58d83ee94b9d3c682f28d8763423edc121e458cf Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 31 Dec 2016 09:42:44 -0500
Subject: Make sure swipe does not show flags is alarms/scrub is on #388

---
 www/js/EventCtrl.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index bde55b86..a5ddc44d 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -950,6 +950,15 @@ angular.module('zmApp.controllers')
 
     };
 
+    $scope.alarmSwipe = function(e)
+    {
+
+        //alert ("HERE");
+        console.log ("HERE");
+        e.stopPropagation();
+        e.preventDefault();
+    };
+
     $scope.toggleMotionOutline = function()
     {
         $scope.outlineMotion = !$scope.outlineMotion;
@@ -2079,6 +2088,7 @@ angular.module('zmApp.controllers')
         }
 
         event.Event.ShowScrub = !event.Event.ShowScrub;
+        //console.log ("SCRUBBING IS "+event.Event.ShowScrub);
         // $ionicScrollDelegate.resize();
 
         //console.log ("GROUP TYPE IS " + groupType);
@@ -2088,8 +2098,8 @@ angular.module('zmApp.controllers')
 
             if (groupType == 'alarms')
             {
-                $ionicListDelegate.canSwipeItems(false);
-                NVRDataModel.debug ("Disabling flag swipe as alarms are swipable");
+               // $ionicListDelegate.canSwipeItems(false);
+                //NVRDataModel.debug ("Disabling flag swipe as alarms are swipable");
                 $scope.alarm_images = [];
                 event.Event.height = (eventsListDetailsHeight + eventsListScrubHeight);
                 $ionicScrollDelegate.resize();
-- 
cgit v1.2.3