more logs demotion

6 files changed, 19 insertions, 18 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index eed17b60..c864f11b 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -456,7 +456,7 @@ angular.module('zmApp.controllers')
           pageLoaded = true;
           //$scope.viewTitle.title = data.pagination.count;
 
-          console.log(JSON.stringify(data.pagination));
+         // console.log(JSON.stringify(data.pagination));
           if (data.pagination && data.pagination.pageCount)
             maxEventsPage = data.pagination.pageCount;
 
@@ -919,7 +919,7 @@ angular.module('zmApp.controllers')
 
         function onError(error) {
           $ionicLoading.hide();
-          console.log("Error: " + error);
+          NVR.debug("Error: " + error);
 
         }
       }
@@ -2320,7 +2320,7 @@ angular.module('zmApp.controllers')
           videoURL += NVR.insertBasicAuthToken();
 
 
-          console.log("************** VIDEO IS " + videoURL);
+         //  console.log("************** VIDEO IS " + videoURL);
           event.Event.video.config = {
             autoPlay: true,
             sources: [{
@@ -2751,13 +2751,13 @@ angular.module('zmApp.controllers')
       // the events API does not return an error for anything
       // except greater page limits than reported
 
-      console.log("***** LOADING MORE INFINITE SCROLL ****");
+      //console.log("***** LOADING MORE INFINITE SCROLL ****");
 
       if ((currEventsPage >= maxEventsPage) && (pageLoaded)) {
         moreEvents = false;
         NVR.debug("No more - We have a total of " + maxEventsPage + " and are at page=" + currEventsPage);
 
-        console.log("*** At Page " + currEventsPage + " of " + maxEventsPage + ", not proceeding");
+       // console.log("*** At Page " + currEventsPage + " of " + maxEventsPage + ", not proceeding");
         $ionicLoading.hide();
         return;
       }
@@ -2776,7 +2776,7 @@ angular.module('zmApp.controllers')
       if ($scope.search.text != "") {
     
         var toastStr = $translate.instant('kPleaseWait') +'...'+ currEventsPage;
-        console.log ("SHOW " + toastStr );
+       // console.log ("SHOW " + toastStr );
         $ionicLoading.show({
           maxwidth: 100,
           noBackdrop:true,
@@ -3017,7 +3017,7 @@ angular.module('zmApp.controllers')
 
       var ld = NVR.getLogin();
 
-      console.log("Toggling " + ld.enableAlarmCount);
+     // console.log("Toggling " + ld.enableAlarmCount);
       ld.enableAlarmCount = !ld.enableAlarmCount;
       NVR.setLogin(ld);
       $scope.loginData = NVR.getLogin();
diff --git a/www/js/FirstUseCtrl.js b/www/js/FirstUseCtrl.js
index 02d7c177..c6f55ef4 100644
--- a/www/js/FirstUseCtrl.js
+++ b/www/js/FirstUseCtrl.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope',
       cordova.plugin.http.setSSLCertMode('nocheck', function () {
         NVR.debug('--> First use -> SSL is permissive, will allow any certs for now. You can change it later.');
       }, function () {
-        console.log('-->First Use -> Error setting SSL permissive');
+        NVR.log('-->First Use -> Error setting SSL permissive');
       });
 
       if ($rootScope.platformOS == 'android') {
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 08e7d75c..9e369f02 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -653,7 +653,7 @@ function mobilePinConfig () {
 
 
     $rootScope.authSession = '';
-    console.log ("***** CLEARING AUTHSESSION IN SAVEITEMS");
+    //console.log ("***** CLEARING AUTHSESSION IN SAVEITEMS");
 
     if ($rootScope.platformOS != 'desktop') {
 
@@ -669,7 +669,7 @@ function mobilePinConfig () {
         cordova.plugin.http.setSSLCertMode('nocheck', function () {
           NVR.debug('--> SSL is permissive, will allow any certs. Use at your own risk.');
         }, function () {
-          console.log('-->Error setting SSL permissive');
+          NVR.log('-->Error setting SSL permissive');
         });
 
         if ($rootScope.platformOS == 'android') {
@@ -790,7 +790,7 @@ function mobilePinConfig () {
                 .then(function (data) {
                     var refresh = NVR.getMonitors(1);
                     $rootScope.apiVersion = data;
-                    console.log ("ALERT="+showalert);
+                   // console.log ("ALERT="+showalert);
                     if (showalert) {
                       $rootScope.zmPopup = SecuredPopups.show('alert', {
                         title: $translate.instant('kLoginValidatedTitle'),
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 7888c37c..50061d0d 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -277,7 +277,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         var data = succ.data;
         var ld = NVR.getLogin();
         NVR.debug("Got " + data.events.length + "new history events...");
-        console.log (JSON.stringify(data));
+        //console.log (JSON.stringify(data));
         var eid, mid, stime;
         for (i = 0; i < data.events.length; i++) {
           mid = data.events[i].Event.MonitorId;
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 11a61432..f1350f0f 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -1358,7 +1358,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
   }
 
   $scope.thumbnailClicked = function(event) {
-   console.log ("Thumb tapped");
+   //console.log ("Thumb tapped");
     if (!$scope.currentThumbEvent) {
         // will this ever be? Don't think so
         NVR.debug ("No thumb rendered");
diff --git a/www/js/app.js b/www/js/app.js
index 140c8cad..27a9aff9 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -720,7 +720,7 @@ angular.module('zmApp', [
 
       
         if (response.data && typeof(response.data) == 'string' && (response.data.indexOf("<pre class=\"cake-error\">")==0)) {
-            console.log ("cake error detected, attempting fix...");
+            NVR.debug ("cake error detected, attempting fix...");
             //console.log ("BAD = "+ JSON.stringify(response.data));
             response.data = JSON.parse(response.data.replace(/<pre class=\"cake-error\">[\s\S]*<\/pre>/,''));
            // console.log ("FIXED="+JSON.stringify(response.data));
@@ -935,7 +935,8 @@ angular.module('zmApp', [
 
             },
             function (err) {
-              console.log("AUTH HASH ERROR: " + JSON.stringify(conf));
+            
+             NVR.debug("Auth Hash error: " + JSON.stringify(conf));
             });
       }
 
@@ -1278,7 +1279,7 @@ angular.module('zmApp', [
               $rootScope.dpadId = 0;
               $rootScope.dpadState = $state.current.name.replace('app.', "");
             }
-            console.log("dpad State is: " + $rootScope.dpadState);
+            //console.log("dpad State is: " + $rootScope.dpadState);
             handled = true;
           } else if (keyCode == keyCodes.SELECT) { // select
             if ($rootScope.dpadId > 0) {
@@ -1329,7 +1330,7 @@ angular.module('zmApp', [
                 nextel[0].scrollIntoView();
                 $rootScope.dpadId = nextId;
               }
-              console.log("dpadID=" + $rootScope.dpadId + " with state=" + $rootScope.dpadState);
+             // console.log("dpadID=" + $rootScope.dpadId + " with state=" + $rootScope.dpadState);
             }
             handled = true;
           }
@@ -1877,7 +1878,7 @@ angular.module('zmApp', [
               loadServices();
             }, function (err) {
               
-              console.log("ERR " + JSON.stringify(err));
+            //  console.log("ERR " + JSON.stringify(err));
               $rootScope.lastState = "app.montage";
               loadServices();
             });