cleanup on logs

6 files changed, 12 insertions, 12 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index b39921fd..fb2916aa 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -158,7 +158,7 @@ angular.module('zmApp.controllers')
     $scope.$on('$ionicView.beforeLeave', function()
     {
 
-        NVRDataModel.debug ("Deregistering broadcast handles");
+        NVRDataModel.debug ("EventCtrl: Deregistering broadcast handles");
         for (var i=0; i < broadcastHandles.length; i++) {
             broadcastHandles[i]();
         }
@@ -2152,7 +2152,7 @@ angular.module('zmApp.controllers')
     {
         NVRDataModel.debug("EventCtrl:onpause called");
         if ($scope.popover) $scope.popover.remove();
-        NVRDataModel.debug ("Deregistering broadcast handles");
+        NVRDataModel.debug ("EventCtrl Pause:Deregistering broadcast handles");
         for (var i=0; i < broadcastHandles.length; i++) {
             broadcastHandles[i]();
         }
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 9fb6f25e..7301c913 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -440,7 +440,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     function onPause()
     {
-        NVRDataModel.debug ("Deregistering broadcast handles");
+        NVRDataModel.debug ("EventModal Pause: Deregistering broadcast handles");
         for (var i=0; i < broadcastHandles.length; i++) {
             broadcastHandles[i]();
         }
@@ -457,8 +457,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     function onResume()
     {
-        NVRDataModel.debug("EventModalCtrl: Modal resume called");
-        $rootScope.modalRand = Math.floor((Math.random() * 100000) + 1);
+       /* NVRDataModel.debug("EventModalCtrl: Modal resume called");
+        $rootScope.modalRand = Math.floor((Math.random() * 100000) + 1);*/
 
     }
 
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index fe18fe22..9f00a8f7 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -26,8 +26,8 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
 
     function onResume()
     {
-        NVRDataModel.debug("LogCtrl: resume called, starting log timer");
-        loadLogs();
+       // NVRDataModel.debug("LogCtrl: resume called, starting log timer");
+      loadLogs();
     }
 
     $scope.flipLogs = function()
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 1a728de4..d8b89d3b 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -30,7 +30,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
   document.addEventListener("resume", onResume, false);
 
   function onResume() {
-    NVRDataModel.log("Login screen resumed");
+   // NVRDataModel.log("Login screen resumed");
 
   }
 
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 9971de86..df674642 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -9,13 +9,13 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     var processPush = false;
     var broadcastHandles = [];
 
-    $scope.$on ('$ionicView.beforeEnter', function() {
+    $scope.$on ('$ionicView.beforeLeave', function() {
         //processPush = false;
        // NVRDataModel.debug ("BeforeEnter in Portal: setting ProcessPush to false");
     });
 
     $scope.$on ('$ionicView.beforeLeave', function() {
-       NVRDataModel.debug ("Deregistering broadcast handles");
+       NVRDataModel.debug ("Portal: Deregistering broadcast handles");
        for (var i=0; i < broadcastHandles.length; i++) {
            broadcastHandles[i]();
        }
@@ -25,7 +25,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     $scope.$on('$ionicView.enter',
         function()
         {
-
+            NVRDataModel.setJustResumed(false);
             
             NVRDataModel.debug("Inside Portal login Enter handler");
             loginData = NVRDataModel.getLogin();
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index a1060265..9e11fee7 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -298,7 +298,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     $scope.$on('$ionicView.leave', function()
     {
 
-        NVRDataModel.debug ("Deregistering broadcast handles");
+        NVRDataModel.debug ("Timeline: Deregistering broadcast handles");
         for (var i=0; i < broadcastHandles.length; i++) {
             broadcastHandles[i]();
         }