From 04b1fd8f094e65308fc39b8aa853a52b8309a928 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Mon, 23 May 2016 11:53:40 -0400 Subject: fixes #257 Former-commit-id: 34a650776fe889778fd02f643efb2aec34e54299 --- www/js/EventModalCtrl.js | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'www/js/EventModalCtrl.js') diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 0d33254c..ced6229c 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -751,14 +751,24 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if (ld.useNphZmsForEvents) { $timeout (function() { - ZMDataModel.zmLog ("Starting checkAllEvents interval..."); - - //eventQueryHandle = $timeout (checkEvent(), zm.eventPlaybackQuery); - $interval.cancel(eventQueryHandle); - eventQueryHandle = $interval(function () { - checkEvent(); - // console.log ("Refreshing Image..."); - }.bind(this),zm.eventPlaybackQuery); + + if ($scope.modal.isShown()) + { + ZMDataModel.zmLog (">>>Starting checkAllEvents interval..."); + + //eventQueryHandle = $timeout (checkEvent(), zm.eventPlaybackQuery); + + $interval.cancel(eventQueryHandle); + eventQueryHandle = $interval(function () { + checkEvent(); + // console.log ("Refreshing Image..."); + }.bind(this),zm.eventPlaybackQuery); + } + else + { + ZMDataModel.zmLog (">>>Modal was exited, not starting checkAllEvents"); + } + },5000); } -- cgit v1.2.3