diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index e091b5f7..1731af45 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -172,6 +172,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro //------------------------------------------------------ function checkEvent() { + + if ($scope.modalFromTimelineIsOpen == false) + { + NVRDataModel.log ("Modal was closed in timeline, cancelling timer"); + $interval.cancel(eventQueryHandle); + return; + } + //console.log ("Event timer"); //console.log ("Event timer"); $scope.checkEventOn = true; @@ -878,6 +886,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.$on('modal.removed', function (e, m) { + console.log ("************* REMOVE CALLED"); $interval.cancel(eventQueryHandle); if (m.id != 'footage') return; |