From 9d2ae83c10d98c4dedf67680d15a74e3945c9977 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 9 Feb 2019 11:05:19 -0500
Subject: fixed a bug where popover in events fails because eventserver
 sendMessage exceptions out

---
 www/js/EventCtrl.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'www/js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 68037a7b..b0d61180 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -57,6 +57,7 @@ angular.module('zmApp.controllers')
     var nolangFrom;
     var nolangTo;
     var broadcastHandles = [];
+    var intervalReloadEvents;
 
     $scope.typeOfFrames = $translate.instant('kShowTimeDiffFrames');
     $scope.outlineMotion = false;
@@ -126,6 +127,11 @@ angular.module('zmApp.controllers')
 
       }, 100);
 
+    /*  NVR.debug ("Starting page refresh timer");
+      intervalReloadEvents = $interval(function () {
+        doRefresh();
+      }.bind(this), 10 * 1000);*/
+
     });
 
 
@@ -147,6 +153,8 @@ angular.module('zmApp.controllers')
 
     $scope.$on('$ionicView.beforeLeave', function () {
 
+      /*NVR.debug ("Cancelling page reload timer");
+      $interval.cancel(intervalReloadEvents);*/
       NVR.debug("EventCtrl: Deregistering resize listener");
       window.removeEventListener("resize", recomputeThumbSize, false);
       //NVR.debug("EventCtrl: Deregistering broadcast handles");
@@ -2411,17 +2419,19 @@ angular.module('zmApp.controllers')
       //  console.log("**VIEW ** Events Ctrl Entered");
       NVR.setAwake(false);
 
-      EventServer.sendMessage('push', {
-        type: 'badge',
-        badge: 0,
-      });
-
       $ionicPopover.fromTemplateUrl('templates/events-popover.html', {
         scope: $scope,
       }).then(function (popover) {
         $scope.popover = popover;
       });
 
+      EventServer.sendMessage('push', {
+        type: 'badge',
+        badge: 0,
+      });
+
+      
+
       //reset badge count
       if (window.cordova && window.cordova.plugins.notification) {
         $cordovaBadge.set(0).then(function () {
@@ -3049,6 +3059,7 @@ angular.module('zmApp.controllers')
       var refresh = NVR.getMonitors(1);
       refresh.then(function (data) {
         $scope.monitors = data;
+        message = data;
 
         /* var ld = NVR.getLogin();
          if (ld.persistMontageOrder) {
-- 
cgit v1.2.3