From 5497a287a3279cf7c0999c40b87f95c6d82cef3e Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 6 May 2018 20:17:35 -0400 Subject: #546 delete from timeline --- www/js/EventModalCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/js/EventModalCtrl.js') diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index bb5dce5e..d7bbfee8 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1499,7 +1499,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro deleteEvent(id) .then (function (succ) { $ionicLoading.hide(); - $scope.modalData.doRefresh = true; + if ($scope.modalData) $scope.modalData.doRefresh = true; var dirn = 1; if (!$scope.nextId && $scope.prevId) dirn = -1; @@ -1667,7 +1667,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro var ld = NVRDataModel.getLogin(); if (!ld.canSwipeMonitors) return; - if ($state.current.name=="app.moment") { + /* if ($state.current.name=="app.moment") { // console.log ("Searching for eid:"+eventId); var i; for (i=0; i < $scope.moments.length;i++) { @@ -1680,7 +1680,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro maxAlarmFid = $scope.moments[i].Event.MaxScoreFrameId; eventId = $scope.moments[i].Event.Id; return; - } + }*/ if (1) { // NVRDataModel.log("using zms to move "); -- cgit v1.2.3