diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-23 11:53:40 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-23 11:53:40 -0400 |
| commit | 04b1fd8f094e65308fc39b8aa853a52b8309a928 (patch) | |
| tree | caaf7f4e36deb69a6944f14a978bbf0590fa295d /www/js | |
| parent | 3d28695593da6fcb1a07fd8797e9202bc87aab67 (diff) | |
fixes #257
Former-commit-id: 34a650776fe889778fd02f643efb2aec34e54299
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 26 |
2 files changed, 19 insertions, 9 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 45dd582c..40e35534 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1252,7 +1252,7 @@ angular.module('zmApp.controllers') // it on open //-------------------------------------------------------- $scope.closeModal = function () { - ZMDataModel.zmDebug("EventCtrl:Close & Destroy Modal"); + ZMDataModel.zmDebug(">>>EventCtrl:Close & Destroy Modal"); ZMDataModel.setAwake(false); if ($scope.modal !== undefined) { $scope.modal.remove(); 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); } |