From 44a2a2905fc0e4e51c12540757b058fe4bab01ef Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 30 Jun 2019 11:55:39 -0400 Subject: #827 keep track of last time updated, don't close if <=300ms --- www/js/EventCtrl.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index dc3c2453..d873e514 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -2543,6 +2543,7 @@ angular.module('zmApp.controllers') $scope.modalGraph = function () { + $scope.lastVideoStateTime = ''; $ionicModal.fromTemplateUrl('templates/events-modalgraph.html', { scope: $scope, // give ModalCtrl access to this scope animation: 'slide-in-up', @@ -2663,7 +2664,9 @@ angular.module('zmApp.controllers') if (ld.showLiveForInProgressEvents) { sl = 'enabled'; } - + $scope.lastVideoStateTime = { + 'time':'' + }; NVR.debug("Shall I follow the same monitor for prev/next?:"+$scope.followSameMonitor); $ionicModal.fromTemplateUrl('templates/events-modal.html', { scope: $scope, @@ -2690,6 +2693,12 @@ angular.module('zmApp.controllers') //-------------------------------------------------------- $scope.closeModal = function () { NVR.debug(">>>EventCtrl:Close & Destroy Modal"); + var diff = moment().diff($scope.lastVideoStateTime.time); + if (diff <= 300) { + NVR.debug ("Not closing model, time interval was only:"+diff+" ms"); + return; + } + NVR.setAwake(false); if ($scope.modal !== undefined) { $scope.modal.remove(); -- cgit v1.2.3