console cleanups

Former-commit-id: 49f0a567d765d3ce1f580383248ee1e6e6a496ef

19 files changed, 202 insertions, 187 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 0d67fba7..eeae0784 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -379,7 +379,7 @@ angular.module('zmApp.controllers')
                  }
                  else
                  {
-                     console.log ("Skipping insomnia, cordova does not exist");
+                     //console.log ("Skipping insomnia, cordova does not exist");
                  }
             }
             else
@@ -390,7 +390,7 @@ angular.module('zmApp.controllers')
                  }
                  else
                  {
-                     console.log ("Skipping insomnia, cordova does not exist");
+                     //console.log ("Skipping insomnia, cordova does not exist");
                  }
 
 
@@ -808,7 +808,7 @@ angular.module('zmApp.controllers')
                         {
                             monitors[i].Monitor.listDisplay='show';
                             monitors[i].Monitor.isAlarmed = 'false';
-                            monitors[i].Monitor.connKey = "";
+                            monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
                             
                             
                            // monitors[i].Monitor.sortOrder=i;
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index ad5d48cc..5cb6e1d4 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -44,7 +44,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** DevOptions Ctrl Entered");
+        //console.log("**VIEW ** DevOptions Ctrl Entered");
         ZMDataModel.setAwake(false);
     });
 
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index f4ca7da8..cbe6d399 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -82,7 +82,7 @@ angular.module('zmApp.controllers')
         }, 1000);
 
         document.addEventListener("pause", onPause, false);
-        console.log("I got STATE PARAM " + $stateParams.id);
+        //console.log("I got STATE PARAM " + $stateParams.id);
         $scope.id = parseInt($stateParams.id, 10);
         $scope.connKey = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
 
@@ -150,7 +150,7 @@ angular.module('zmApp.controllers')
         // monitor modal is loaded, I show an ionic loading. And then when the first frame
         // finishes loading, I take it away
 
-        console.log("***CALLING EVENTS FACTORY");
+        //console.log("***CALLING EVENTS FACTORY");
         var lData = ZMDataModel.getLogin();
 
         var stackState = $ionicHistory.backTitle();
@@ -201,7 +201,7 @@ angular.module('zmApp.controllers')
                     "-" + $rootScope.toString);
                 ZMDataModel.getEvents($scope.id, eventsPage, "", $rootScope.fromString, $rootScope.toString)
                     .then(function (data) {
-                        console.log("EventCtrl Got events");
+                       // console.log("EventCtrl Got events");
                         //var events = [];
 
                         var myevents = data;
@@ -300,7 +300,7 @@ angular.module('zmApp.controllers')
 
             var mFromDate = moment().subtract(parseInt(val), unit);
 
-            console.log("Moment Dates:" + mFromDate.format() + " TO  " + mToDate.format());
+           // console.log("Moment Dates:" + mFromDate.format() + " TO  " + mToDate.format());
 
             $rootScope.fromTime = mFromDate.toDate();
             $rootScope.toTime = mToDate.toDate();
@@ -321,8 +321,8 @@ angular.module('zmApp.controllers')
                 .format("HH:mm:ss");
 
 
-            console.log("**************From String: " + $rootScope.fromString);
-            console.log("**************To String: " + $rootScope.toString);
+           // console.log("**************From String: " + $rootScope.fromString);
+          //  console.log("**************To String: " + $rootScope.toString);
 
             // reloading - may solve https://github.com/pliablepixels/zmNinja/issues/36
             // if you are in the same mid event page $state.go won't work
@@ -392,7 +392,7 @@ angular.module('zmApp.controllers')
         //-------------------------------------------------
 
         $scope.filterTapped = function () {
-            console.log("FILTER TAPPED");
+            //console.log("FILTER TAPPED");
             var myFrom = moment($rootScope.fromString).format("MMM/DD/YYYY hh:mm a").toString();
             var toString = moment($rootScope.toString).format("MMM/DD/YYYY hh:mm a").toString();
 
@@ -590,8 +590,8 @@ angular.module('zmApp.controllers')
         //-------------------------------------------------------------------------
         function onPause() {
             ZMDataModel.zmDebug("EventCtrl:onpause called");
-            console.log("*** Moving to Background ***"); // Handle the pause event
-            console.log("*** CANCELLING INTERVAL ****");
+            //console.log("*** Moving to Background ***"); // Handle the pause event
+            //console.log("*** CANCELLING INTERVAL ****");
             if ($scope.popover) $scope.popover.remove();
             $interval.cancel(segmentHandle);
             // FIXME: Do I need to  setAwake(false) here?
@@ -645,7 +645,7 @@ angular.module('zmApp.controllers')
 
         function toggleGroup(event, ndx, frames, groupType) {
             
-            console.log ("*** video: " + event.Event.DefaultVideo);
+           // console.log ("*** video: " + event.Event.DefaultVideo);
             
             
             // If we are here and there is a record of a previous scroll
@@ -656,7 +656,7 @@ angular.module('zmApp.controllers')
             }
 
             if (oldEvent && event != oldEvent) {
-                console.log("SWITCHING OLD EVENT OFF");
+               // console.log("SWITCHING OLD EVENT OFF");
                 ZMDataModel.zmDebug("EventCtrl:Old event scrub will hide now");
                 oldEvent.Event.ShowScrub = false;
                 oldEvent.Event.height = zm.eventsListDetailsHeight;
@@ -666,7 +666,7 @@ angular.module('zmApp.controllers')
             event.Event.ShowScrub = !event.Event.ShowScrub;
             // $ionicScrollDelegate.resize();
 
-            console.log ("GROUP TYPE IS " + groupType);
+            //console.log ("GROUP TYPE IS " + groupType);
             
              if (event.Event.ShowScrub == true)  // turn on display now
              {
@@ -787,7 +787,7 @@ angular.module('zmApp.controllers')
                     event.Event.video = {};
                     var videoURL = loginData.url + "/events/" + event.Event.relativePath + event.Event.DefaultVideo;
 
-                    console.log("************** VIDEO IS " + videoURL);
+                   // console.log("************** VIDEO IS " + videoURL);
                     event.Event.video.config = {
                         autoPlay: true,
                         sources: [
@@ -841,9 +841,9 @@ angular.module('zmApp.controllers')
                     //console.log(JSON.stringify(locobject));
                     var toplocation = parseInt(locobject.top);
                     var objheight = parseInt(locobject.height);
-                    console.log("top location is " + toplocation);
+                   // console.log("top location is " + toplocation);
                     var distdiff = parseInt($rootScope.devHeight) - toplocation - objheight;
-                    console.log("*****Space at  bottom is " + distdiff);
+                   // console.log("*****Space at  bottom is " + distdiff);
 
                     if (distdiff < zm.eventsListScrubHeight) // size of the scroller with bars
                     {
@@ -894,7 +894,7 @@ angular.module('zmApp.controllers')
             // in the image src and it will refresh. No need to reload the view
             // and if you did reload the view, it would go back to events list
             // which is the view - and when you are in the modal it will go away
-            console.log("*** Refreshing Modal view ***");
+            //console.log("*** Refreshing Modal view ***");
             //$state.go($state.current, {}, {reload: true});
             $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
             $ionicLoading.show({
@@ -909,17 +909,17 @@ angular.module('zmApp.controllers')
         // when you tap a list entry - to break search loop
         //---------------------------------------------------
         $scope.tapped = function () {
-            console.log("*** TAPPED ****");
+           // console.log("*** TAPPED ****");
             // if he tapped, the we are not infinite loading on ion-infinite
             if (enableLoadMore == false) {
                 moreEvents = true;
                 enableLoadMore = true;
-                console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
+               // console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
             }
         };
 
         $scope.$on('$ionicView.loaded', function () {
-            console.log("**VIEW ** Events Ctrl Loaded");
+          //  console.log("**VIEW ** Events Ctrl Loaded");
         });
 
         //-------------------------------------------------------------------------
@@ -930,7 +930,7 @@ angular.module('zmApp.controllers')
         // state, that effectively overwrites current view power management needs
         //------------------------------------------------------------------------
         $scope.$on('$ionicView.enter', function () {
-            console.log("**VIEW ** Events Ctrl Entered");
+          //  console.log("**VIEW ** Events Ctrl Entered");
             ZMDataModel.setAwake(false);
 
             EventServer.sendMessage('push', {
@@ -959,12 +959,12 @@ angular.module('zmApp.controllers')
         });
 
         $scope.$on('$ionicView.leave', function () {
-            console.log("**VIEW ** Events Ctrl Left");
+            //console.log("**VIEW ** Events Ctrl Left");
         });
 
         $scope.$on('$ionicView.unloaded', function () {
-            console.log("**VIEW ** Events Ctrl Unloaded");
-            console.log("*** MODAL ** Destroying modal too");
+            //console.log("**VIEW ** Events Ctrl Unloaded");
+            //console.log("*** MODAL ** Destroying modal too");
             if ($scope.modal !== undefined) {
                 $scope.modal.remove();
             }
@@ -1009,11 +1009,11 @@ angular.module('zmApp.controllers')
         function segmentCheck() {
             if ($scope.totalEventTime == 0) {
 
-                console.log("No events to play");
+                //console.log("No events to play");
                 return;
             }
             if ($scope.currentEventTime >= $scope.totalEventTime) {
-                console.log("Total event duration reached");
+               // console.log("Total event duration reached");
                 $scope.currentEventTime = $scope.totalEventTime;
                 return;
             }
@@ -1147,7 +1147,7 @@ angular.module('zmApp.controllers')
             });
             req.success(function (resp) {
 
-                console.log("SUCCESS: " + JSON.stringify(resp));
+               // console.log("SUCCESS: " + JSON.stringify(resp));
                 var str = toast_blurb + "event:" + resp.status.event;
                 // console.log(str);
                 // $ionicLoading.hide();
@@ -1167,9 +1167,9 @@ angular.module('zmApp.controllers')
                 }
 
                 if (cmd == '12' || cmd == '13') {
-                    console.log("New event, so recomputing");
+                   // console.log("New event, so recomputing");
                     var newevent = resp.status.event;
-                    console.log("**** EXTRACTED EVENT ****" + newevent);
+                    //console.log("**** EXTRACTED EVENT ****" + newevent);
                     var ld = ZMDataModel.getLogin();
                     var myurl = ld.apiurl + "/events/" + newevent + ".json";
                     $http.get(myurl)
@@ -1181,7 +1181,7 @@ angular.module('zmApp.controllers')
 
                         })
                         .error(function (err) {
-                            console.log("Error : " + JSON.stringify(err));
+                           // console.log("Error : " + JSON.stringify(err));
                             ZMDataModel.zmLog("Error getting timing info for new event " + newevent + ":" + JSON.stringify(err));
                             $scope.totalEventTime = 0;
 
@@ -1191,7 +1191,7 @@ angular.module('zmApp.controllers')
             });
 
             req.error(function (resp) {
-                console.log("ERROR: " + JSON.stringify(resp));
+               // console.log("ERROR: " + JSON.stringify(resp));
                 ZMDataModel.zmLog("Error sending event command " + JSON.stringify(resp), "error");
             });
         }
@@ -1319,7 +1319,7 @@ angular.module('zmApp.controllers')
         // I Don't think it ever comes here
         //--------------------------------------------------------
         $scope.$on('$destroy', function () {
-            console.log("Destroy Modal");
+            //console.log("Destroy Modal");
             if ($scope.modal !== undefined) {
                 $scope.modal.remove();
             }
@@ -1342,7 +1342,7 @@ angular.module('zmApp.controllers')
         $scope.cancelSearch = function () {
             $ionicLoading.hide(); //Or whatever action you want to preform
             enableLoadMore = false;
-            console.log("**** CANCELLED ****");
+            //console.log("**** CANCELLED ****");
             $ionicLoading.show({
                 template: 'Search Cancelled',
                 animation: 'fade-in',
@@ -1364,11 +1364,11 @@ 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 ****");
             eventsPage--;
             if ((eventsPage <= 0) && (pageLoaded)) {
                 moreEvents = false;
-                console.log("*** At Page " + eventsPage + ", not proceeding");
+                //console.log("*** At Page " + eventsPage + ", not proceeding");
                 return;
             }
 
@@ -1376,7 +1376,7 @@ angular.module('zmApp.controllers')
                 moreEvents = false; // Don't ion-scroll till enableLoadMore is true;
                 $scope.$broadcast('scroll.infiniteScrollComplete');
 
-                console.log("**** LOADMORE ARTIFICALLY DISABLED");
+               // console.log("**** LOADMORE ARTIFICALLY DISABLED");
                 return;
             }
 
@@ -1395,7 +1395,7 @@ angular.module('zmApp.controllers')
             ZMDataModel.getEvents($scope.id, eventsPage, loadingStr, $rootScope.fromString, $rootScope.toString)
                 .then(function (data) {
                         var loginData = ZMDataModel.getLogin();
-                        console.log("Got new page of events with Page=" + eventsPage);
+                       // console.log("Got new page of events with Page=" + eventsPage);
                         var myevents = data;
 
                         for (var i = 0; i < myevents.length; i++) {
@@ -1434,13 +1434,13 @@ angular.module('zmApp.controllers')
                             if (idfound) $scope.events = $scope.events.concat(myevents[i]);
                         }
 
-                        console.log("Got new page of events");
+                        //console.log("Got new page of events");
                         moreEvents = true;
                         $scope.$broadcast('scroll.infiniteScrollComplete');
                     },
 
                     function (error) {
-                        console.log("*** No More Events to Load, Stop Infinite Scroll ****");
+                       // console.log("*** No More Events to Load, Stop Infinite Scroll ****");
                         moreEvents = false;
                         $scope.$broadcast('scroll.infiniteScrollComplete');
 
@@ -1453,7 +1453,7 @@ angular.module('zmApp.controllers')
         };
         
         $scope.toggleMinAlarmFrameCount = function () {
-            console.log ("Toggling");
+           // console.log ("Toggling");
             
             var ld = ZMDataModel.getLogin();
             ld.minAlarmCount = ld.minAlarmCount=='0'?'1':'0';
@@ -1500,7 +1500,7 @@ angular.module('zmApp.controllers')
         }; //dorefresh
 
         function doRefresh() {
-            console.log("***Pull to Refresh");
+           // console.log("***Pull to Refresh");
 
             ZMDataModel.zmDebug("Reloading monitors");
             var refresh = ZMDataModel.getMonitors(1);
@@ -1520,13 +1520,13 @@ angular.module('zmApp.controllers')
                 ZMDataModel.getEventsPages($scope.id, $rootScope.fromString, $rootScope.toString)
                     .then(function (data) {
                         eventsPage = data.pageCount;
-                        console.log("TOTAL EVENT PAGES IS " + eventsPage);
+                       // console.log("TOTAL EVENT PAGES IS " + eventsPage);
                         pageLoaded = true;
                         $scope.viewTitle.title = data.count;
                         ZMDataModel.getEvents($scope.id, eventsPage, "", $rootScope.fromString, $rootScope.toString)
 
                         .then(function (data) {
-                            console.log("EventCtrl Got events");
+                            //console.log("EventCtrl Got events");
                             //var events = [];
                             var myevents = data;
                             for (var i = 0; i < myevents.length; i++) {
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
index 001a6f0d..1d2535b7 100644
--- a/www/js/EventDateTimeFilterCtrl.js
+++ b/www/js/EventDateTimeFilterCtrl.js
@@ -54,26 +54,26 @@ angular.module('zmApp.controllers')
     //--------------------------------------------------------------------------
             $scope.saveFilters = function () {
                 if (!$rootScope.fromDate) {
-                    console.log("RESET fromDate");
+                    //console.log("RESET fromDate");
                     $rootScope.fromDate = new Date();
                     ZMDataModel.zmDebug("DateTimeFilter: resetting from date");
                 }
 
                 if (!$rootScope.toDate) {
-                    console.log("RESET toDate");
+                   // console.log("RESET toDate");
                     $rootScope.toDate = new Date();
                     ZMDataModel.zmDebug("DateTimeFilter: resetting to date");
                 }
 
                 if (!$rootScope.fromTime) {
-                    console.log("RESET fromTime");
+                   // console.log("RESET fromTime");
                     $rootScope.fromTime = new Date(99, 5, 24, 0, 0, 0, 0); //moment().format("hh:mm:ss");
                     ZMDataModel.zmDebug("DateTimeFilter: resetting from time");
                 }
 
 
                 if (!$rootScope.toTime) {
-                    console.log("RESET toTime");
+                    //console.log("RESET toTime");
                     $rootScope.toTime = new Date(99, 5, 24, 23, 59, 59, 0);
                     //$rootScope.toTime = "01:01:02"; //moment().format("hh:mm:ss");
                     ZMDataModel.zmDebug("DateTimeFilter: resetting to time");
diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js
index 20782551..fe1185e7 100644
--- a/www/js/EventsGraphsCtrl.js
+++ b/www/js/EventsGraphsCtrl.js
@@ -9,13 +9,13 @@
 // from the template file
 
 angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$ionicHistory', '$state', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $ionicHistory, $state) {
-    console.log("Inside Graphs controller");
+    //console.log("Inside Graphs controller");
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
 
     $scope.$on('$ionicView.loaded', function () {
-        console.log("**VIEW ** Graph Ctrl Loaded");
+       // console.log("**VIEW ** Graph Ctrl Loaded");
     });
     
     
@@ -41,16 +41,16 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** EventsGraphs Ctrl Entered");
+       // console.log("**VIEW ** EventsGraphs Ctrl Entered");
         ZMDataModel.setAwake(false);
     });
 
     $scope.$on('$ionicView.leave', function () {
-        console.log("**VIEW ** Graph Ctrl Left");
+       // console.log("**VIEW ** Graph Ctrl Left");
     });
 
     $scope.$on('$ionicView.unloaded', function () {
-        console.log("**VIEW ** Graph Ctrl Unloaded");
+      //  console.log("**VIEW ** Graph Ctrl Unloaded");
     });
 
 
@@ -70,7 +70,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
 
 
     var container = angular.element(document.getElementById('visualization'));
-    console.log(JSON.stringify(container));
+    //console.log(JSON.stringify(container));
     var data = [
         {
             id: 1,
@@ -112,7 +112,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
     //---------------------------------------------------
     $scope.handleChartClick = function (event) {
 
-        console.log(JSON.stringify($scope.chartwithbars.getBarsAtEvent(event)));
+        //console.log(JSON.stringify($scope.chartwithbars.getBarsAtEvent(event)));
         //console.log(angular.element[0].getContext('2d'));
         //console.log (JSON.stringify( $scope.chart));
 
@@ -143,7 +143,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
             var cur = moment();
             endDate = cur.format("YYYY-MM-DD hh:mm:ss");
             startDate = cur.subtract(hrs, 'hours').format("YYYY-MM-DD hh:mm:ss");
-            console.log("Start and End " + startDate + "==" + endDate);
+            //console.log("Start and End " + startDate + "==" + endDate);
             ZMDataModel.zmLog("Generating graph for " + startDate + " to " + endDate);
 
         }
@@ -169,7 +169,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
             if (adjustedHeight > $rootScope.devHeight) {
 
                 $scope.chart.barHeight = adjustedHeight;
-                console.log("********* BAR HEIGHT TO " + $scope.chart.barHeight);
+                //console.log("********* BAR HEIGHT TO " + $scope.chart.barHeight);
             }
 
             for (var i = 0; i < monitors.length; i++) {
diff --git a/www/js/FirstUseCtrl.js b/www/js/FirstUseCtrl.js
index 3a31bb71..59d1521e 100644
--- a/www/js/FirstUseCtrl.js
+++ b/www/js/FirstUseCtrl.js
@@ -13,7 +13,7 @@ $scope.openMenu = function () {
     // Controller Main
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** FirstUse Ctrl Entered");
+        //console.log("**VIEW ** FirstUse Ctrl Entered");
         $ionicSideMenuDelegate.canDragContent(false);
     
 
diff --git a/www/js/HelpCtrl.js b/www/js/HelpCtrl.js
index 85a7e45e..d48c808b 100644
--- a/www/js/HelpCtrl.js
+++ b/www/js/HelpCtrl.js
@@ -31,7 +31,7 @@ $scope.openMenu = function () {
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** Help Ctrl Entered");
+        //console.log("**VIEW ** Help Ctrl Entered");
         ZMDataModel.setAwake(false);
 
         
diff --git a/www/js/ImportantMessageCtrl.js b/www/js/ImportantMessageCtrl.js
index ae53dc06..bbb34c32 100644
--- a/www/js/ImportantMessageCtrl.js
+++ b/www/js/ImportantMessageCtrl.js
@@ -14,7 +14,7 @@ $scope.openMenu = function () {
     // Controller Main
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** LowVersion Ctrl Entered");
+        //console.log("**VIEW ** LowVersion Ctrl Entered");
         $ionicSideMenuDelegate.canDragContent(true);
         $scope.requiredVersion = zm.minAppVersion;
         $scope.currentVersion = $stateParams.ver;
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index a11f14f8..e9684ff8 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -46,7 +46,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
         $rootScope.zmPopup.then(function (res) {
             if (res) {
                 $fileLogger.deleteLogfile().then(function () {
-                    console.log('Logfile deleted');
+                    //console.log('Logfile deleted');
                     $fileLogger.setStorageFilename(zm.logFile);
                     $scope.zmLog.logString = "";
                 });
@@ -174,7 +174,7 @@ saveAs(blob, fname);
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** Log Ctrl Entered");
+        //console.log("**VIEW ** Log Ctrl Entered");
         ZMDataModel.setAwake(false);
 
         $scope.zmLog = {
@@ -198,7 +198,7 @@ saveAs(blob, fname);
     
     $scope.$on('$ionicView.leave', function ()
     {
-        console.log ("Deleting Log interval...");
+        //console.log ("Deleting Log interval...");
        // $interval.cancel(intervalLogUpdateHandle);
     });
 
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index e07bbf5a..a6d39e91 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -119,7 +119,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                         serverbuttons.push({
                             text: availableServers[servIter]
                         });
-                        console.log("ADDING : " + availableServers[servIter]);
+                        //console.log("ADDING : " + availableServers[servIter]);
                     }
 
                 } else {
@@ -163,7 +163,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** LoginCtrl  Entered");
+        //console.log("**VIEW ** LoginCtrl  Entered");
         ZMDataModel.setAwake(false);
 
 
diff --git a/www/js/LowVersionCtrl.js b/www/js/LowVersionCtrl.js
index 54d5644f..3ceda222 100644
--- a/www/js/LowVersionCtrl.js
+++ b/www/js/LowVersionCtrl.js
@@ -14,7 +14,7 @@ $scope.openMenu = function () {
     // Controller Main
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** LowVersion Ctrl Entered");
+        //console.log("**VIEW ** LowVersion Ctrl Entered");
         $ionicSideMenuDelegate.canDragContent(true);
         $scope.requiredVersion = zm.minAppVersion;
         $scope.currentVersion = $stateParams.ver;
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index 8c48201a..a4a75807 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -379,7 +379,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
                         str.push(encodeURIComponent(p) + "=" +
                             encodeURIComponent(obj[p]));
                     var foo = str.join("&");
-                    console.log("****RETURNING " + foo);
+                    //console.log("****RETURNING " + foo);
                     return foo;
                 },
 
@@ -395,13 +395,13 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
             });
             req.success(function (resp) {
 
-                console.log("SUCCESS FOR: " + JSON.stringify(resp));
+                //console.log("SUCCESS FOR: " + JSON.stringify(resp));
                
                 if (resp.result=="Ok" && ndx != -1)
                 {   
                     var ld = ZMDataModel.getLogin();
                     var apiurl= ld.apiurl + "/events/"+resp.status.event+".json";
-                    console.log ("API " + apiurl);
+                    //console.log ("API " + apiurl);
                     $http.get (apiurl)
                     .success (function (data)
                     {
@@ -495,8 +495,8 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
             };
         }
 
-        console.log("Command value " + cmd + " with MID=" + monitorId);
-        console.log("PTZDATA is " + JSON.stringify(ptzData));
+        //console.log("Command value " + cmd + " with MID=" + monitorId);
+        //console.log("PTZDATA is " + JSON.stringify(ptzData));
         $ionicLoading.hide();
         $ionicLoading.show({
             template: "please wait...",
@@ -527,7 +527,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
                     str.push(encodeURIComponent(p) + "=" +
                         encodeURIComponent(obj[p]));
                 var foo = str.join("&");
-                console.log("****RETURNING " + foo);
+                //console.log("****RETURNING " + foo);
                 return foo;
             },
             // NOTE: Refer to
@@ -542,7 +542,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
 
         req.success(function (resp) {
             $ionicLoading.hide();
-            console.log("SUCCESS: " + JSON.stringify(resp));
+            //console.log("SUCCESS: " + JSON.stringify(resp));
 
             // $ionicLoading.hide();
 
@@ -550,7 +550,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
 
         req.error(function (resp) {
             $ionicLoading.hide();
-            console.log("ERROR: " + JSON.stringify(resp));
+            //console.log("ERROR: " + JSON.stringify(resp));
             ZMDataModel.zmLog("Error sending PTZ:" + JSON.stringify(resp), "error");
         });
     }
@@ -563,9 +563,9 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
     };
 
     $scope.getZoomLevel = function () {
-        console.log("ON RELEASE");
+        //console.log("ON RELEASE");
         var zl = $ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition();
-        console.log(JSON.stringify(zl));
+        //console.log(JSON.stringify(zl));
     };
 
     $scope.onTap = function (m, d) {
@@ -581,7 +581,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
         if (!ld.canSwipeMonitors) return;
 
         if ($ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom != 1) {
-            console.log("Image is zoomed in - not honoring swipe");
+            //console.log("Image is zoomed in - not honoring swipe");
             return;
         }
         moveToMonitor(m, d);
@@ -603,7 +603,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
         do {
             mid = ZMDataModel.getNextMonitor(m, d);
             m = mid;
-            console.log("Next Monitor is " + m);
+            //console.log("Next Monitor is " + m);
 
 
             found = 0;
@@ -614,7 +614,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
                     $scope.monitors[i].Monitor.Function != 'None' &&
                     $scope.monitors[i].Monitor.Enabled != '0') {
                     found = 1;
-                    console.log(mid + "is part of the monitor list");
+                    //console.log(mid + "is part of the monitor list");
                     ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid);
                     break;
                 } else {
@@ -720,7 +720,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
             duration: 2000
         });
         ZMDataModel.zmLog("Error saving image: " + e.message);
-        console.log("***ERROR");
+        //console.log("***ERROR");
     }
 
 
@@ -803,8 +803,8 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
         var curState = carouselUtils.getStop();
         carouselUtils.setStop(true);
 
-        console.log("Your index is  " + $scope.mycarousel.index);
-        console.log("Associated image is " + $scope.slides[$scope.mycarousel.index].img);
+        //console.log("Your index is  " + $scope.mycarousel.index);
+        //console.log("Associated image is " + $scope.slides[$scope.mycarousel.index].img);
 
         ZMDataModel.zmDebug("ModalCtrl: SaveEventImageToPhone called");
         var canvas, context, imageDataUrl, imageData;
@@ -968,7 +968,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
     $scope.scaleImage = function () {
 
         $scope.imageFit = !$scope.imageFit;
-        console.log("Switching image style to " + $scope.imageFit);
+       // console.log("Switching image style to " + $scope.imageFit);
     };
 
     $scope.$on('$ionicView.enter', function () {
@@ -978,14 +978,14 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
     });
 
     $scope.$on('$ionicView.leave', function () {
-        console.log("**MODAL: Stopping modal timer");
+       // console.log("**MODAL: Stopping modal timer");
         $scope.isModalActive = false;
         $interval.cancel(intervalModalHandle);
     });
     
     
     $scope.$on('$ionicView.beforeLeave', function () {
-        console.log("**VIEW ** ModalCtrl left");
+        //console.log("**VIEW ** ModalCtrl left");
         
         
         //ZMDataModel.zmLog ("ModalCtrl:Nullifying images..."");
@@ -1009,7 +1009,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
 
     $scope.$on('$ionicView.unloaded', function () {
         $scope.isModalActive = false;
-        console.log("**MODAL UNLOADED: Stopping modal timer");
+        //console.log("**MODAL UNLOADED: Stopping modal timer");
         $interval.cancel(intervalModalHandle);
 
         //   console.log("Modal monitor left");
@@ -1017,7 +1017,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
 
     $scope.$on('modal.removed', function () {
         $scope.isModalActive = false;
-        console.log("**MODAL REMOVED: Stopping modal timer");
+        //console.log("**MODAL REMOVED: Stopping modal timer");
         $interval.cancel(intervalModalHandle);
         ZMDataModel.zmDebug ("Modal removed - killing connkey");
         controlStream(17,"",$scope.connKey,-1);
@@ -1072,7 +1072,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
 
 
     $scope.toggleGapless = function () {
-        console.log(">>>>>>>>>>>>>>GAPLESS TOGGLE INSIDE MODAL");
+       // console.log(">>>>>>>>>>>>>>GAPLESS TOGGLE INSIDE MODAL");
         $scope.loginData.gapless = !$scope.loginData.gapless;
         ZMDataModel.setLogin($scope.loginData);
 
@@ -1128,21 +1128,21 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
     //--------------------------------------------------------
 
     $scope.onSwipeEvent = function (eid, dirn) {
-        console.log("HERE");
+        //console.log("HERE");
         var ld = ZMDataModel.getLogin();
         if (!ld.canSwipeMonitors) return;
 
         if ($ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom != 1) {
-            console.log("Image is zoomed in - not honoring swipe");
+            //console.log("Image is zoomed in - not honoring swipe");
             return;
         }
-        console.log("JUMPING");
+        //console.log("JUMPING");
         jumpToEvent(eid, dirn);
 
     };
 
     $scope.jumpToEvent = function (eid, dirn) {
-        console.log("jumptoevent");
+       // console.log("jumptoevent");
 
         jumpToEvent(eid, dirn);
 
@@ -1332,7 +1332,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
                                 $scope.prevId = success.prev;
                             },
                             function (error) {
-                                console.log(JSON.stringify(error));
+                                //console.log(JSON.stringify(error));
                             });
 
                     $scope.nextId = "...";
@@ -1491,7 +1491,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
 
             if ($scope.event && $scope.ionRange.index == parseInt($scope.event.Event.Frames) - 1) {
                 if (!$scope.modal || $scope.modal.isShown() == false) {
-                    console.log("quick scrub playback over");
+                   // console.log("quick scrub playback over");
                     carouselUtils.setStop(true);
                     $scope.ionRange.index = 0;
                     $scope.mycarousel.index = 1;
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index cf3441a9..555f8eb0 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -16,7 +16,7 @@ angular.module('zmApp.controllers')
 
     // var isModalOpen = false;
 
-    console.log("***EVENTS: Waiting for Monitors to load before I proceed");
+   // console.log("***EVENTS: Waiting for Monitors to load before I proceed");
     $scope.monitors = [];
     $scope.monitors = message;
                                    
@@ -38,7 +38,7 @@ angular.module('zmApp.controllers')
     
     var loginData = ZMDataModel.getLogin();
     monitorStateCheck();
-    console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
+    //console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
     ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
                  
     // FIXME: need this as modalctrl uses it. Not needed for monitor
@@ -106,7 +106,7 @@ angular.module('zmApp.controllers')
     //-----------------------------------------------------------------------
     $scope.changeConfig = function (monitorName, monitorId, enabled, func) {
         var checked = false;
-        console.log("called with " + monitorId + ":" + enabled + ":" + func);
+        //console.log("called with " + monitorId + ":" + enabled + ":" + func);
         if (enabled == '1') checked = true;
 
         $scope.monFunctions = [
@@ -251,13 +251,13 @@ angular.module('zmApp.controllers')
 
     // same logic as EventCtrl.js
     $scope.finishedLoadingImage = function () {
-        console.log("***Monitor image FINISHED Loading***");
+       // console.log("***Monitor image FINISHED Loading***");
         $ionicLoading.hide();
     };
 
 
     $scope.$on('$ionicView.loaded', function () {
-        console.log("**VIEW ** Monitor Ctrl Loaded");
+      //  console.log("**VIEW ** Monitor Ctrl Loaded");
     });
 
 
@@ -272,17 +272,17 @@ angular.module('zmApp.controllers')
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** Monitor Ctrl Entered");
+       // console.log("**VIEW ** Monitor Ctrl Entered");
         ZMDataModel.setAwake(false);
     });
 
     $scope.$on('$ionicView.leave', function () {
-        console.log("**VIEW ** Monitor Ctrl Left, force removing modal");
+       // console.log("**VIEW ** Monitor Ctrl Left, force removing modal");
         if ($scope.modal) $scope.modal.remove();
     });
 
     $scope.$on('$ionicView.unloaded', function () {
-        console.log("**VIEW ** Monitor Ctrl Unloaded");
+       // console.log("**VIEW ** Monitor Ctrl Unloaded");
     });
 
     $scope.openModal = function (mid, controllable, controlid, connKey) {
@@ -312,7 +312,7 @@ angular.module('zmApp.controllers')
             
             var apiurl = $scope.LoginData.apiurl;
             var myurl = apiurl + "/controls/" + controlid + ".json";
-            console.log("getting control details:" + myurl);
+           // console.log("getting control details:" + myurl);
 
             $http.get(myurl)
                 .success(function (data) {
@@ -362,11 +362,11 @@ angular.module('zmApp.controllers')
                     }
                     
 
-                    console.log("***moveCommand: " + $scope.ptzMoveCommand);
+                   // console.log("***moveCommand: " + $scope.ptzMoveCommand);
                     ZMDataModel.zmLog("ControlDB reports PTZ command to be " + $scope.ptzMoveCommand  + " and " + $scope.ptzStopCommand);
                 })
                 .error(function (data) {
-                    console.log("** Error retrieving move PTZ command");
+                   // console.log("** Error retrieving move PTZ command");
                     ZMDataModel.zmLog("Error retrieving PTZ command  " + JSON.stringify(data), "error");
                     ZMDataModel.displayBanner('error', ['did not get a valid PTZ response', 'Please try again']);
                     $scope.isControllable = '0';
@@ -398,7 +398,7 @@ angular.module('zmApp.controllers')
     };
 
     $scope.closeModal = function () {
-        console.log("Close & Destroy Monitor Modal");
+       // console.log("Close & Destroy Monitor Modal");
         
         // stop networking -nph-zms keeps sucking data
         
@@ -411,7 +411,7 @@ angular.module('zmApp.controllers')
     };
     //Cleanup the modal when we're done with it!
     $scope.$on('$destroy', function () {
-        console.log("Destroy Monitor Modal");
+        //console.log("Destroy Monitor Modal");
         $scope.modal.remove();
     });
 
@@ -488,7 +488,7 @@ angular.module('zmApp.controllers')
     }
 
     $scope.doRefresh = function () {
-        console.log("***Pull to Refresh");
+        //console.log("***Pull to Refresh");
         doRefresh();
 
 
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index b1fd8ac2..5c7e519f 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -336,7 +336,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     };
 
     $scope.deleteList = function () {
-        console.log("DELETE");
+        //console.log("DELETE");
         $scope.data.showDelete = !$scope.data.showDelete;
         $scope.data.showReorder = false;
     };
@@ -372,7 +372,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         //window.localStorage.setItem("montageOrder", montageOrder.toString());
        // window.localStorage.setItem("montageHiddenOrder",
         //    hiddenOrder.toString());
-        console.log("Saved " + montageOrder.toString());
+       // console.log("Saved " + montageOrder.toString());
         ZMDataModel.zmLog("User press OK. Saved Monitor Order as: " +
             montageOrder.toString() +
             " and hidden order as " + hiddenOrder.toString());
@@ -388,7 +388,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                 montageOrder[i] = i;
                 hiddenOrder[i] = 0;
             }
-            console.log("Order string is " + montageOrder.toString());
+           // console.log("Order string is " + montageOrder.toString());
             ZMDataModel.zmLog("User press Cancel. Reset Monitor Order to: " + montageOrder.toString());
         } else // montageOrder exists
         {
@@ -403,7 +403,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                 hiddenOrder = myhiddenorder.split(",");
             }
 
-            console.log("Montage order is " + myorder + " and hidden order is " + myhiddenorder);
+          //  console.log("Montage order is " + myorder + " and hidden order is " + myhiddenorder);
             montageOrder = myorder.split(",");
 
             for (i = 0; i < montageOrder.length; i++) {
@@ -485,8 +485,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
             hiddenOrder[findindex] = 0;
         }
         //window.localStorage.setItem("montageOrder", montageOrder.toString());
-        console.log("DELETE: Order Array now is " + montageOrder.toString());
-        console.log("DELETE: Hidden Array now is " + hiddenOrder.toString());
+       // console.log("DELETE: Order Array now is " + montageOrder.toString());
+      //  console.log("DELETE: Hidden Array now is " + hiddenOrder.toString());
         ZMDataModel.zmLog("Marked monitor " + findindex + " as " + $scope.MontageMonitors[index].Monitor.listDisplay + " in montage");
 
     };
@@ -530,7 +530,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     $scope.switchMinimal = function () {
         $scope.minimal = !$scope.minimal;
         ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal);
-        console.log("Hide Statusbar");
+       // console.log("Hide Statusbar");
         ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
         $interval.cancel($rootScope.intervalHandle); //we will renew on reload
         // We are reloading this view, so we don't want entry animations
@@ -552,12 +552,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     };
 
     $scope.callback = function () {
-        console.log("dragging");
+       // console.log("dragging");
     };
 
 
     $scope.onDropComplete = function (index, obj, event) {
-        console.log("dragged");
+       // console.log("dragged");
         var otherObj = $scope.monitors[index];
         var otherIndex = $scope.monitors.indexOf(obj);
         $scope.monitors[index] = obj;
@@ -610,7 +610,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                     ZMDataModel.zmDebug("MontageCtrl: control data returned " + JSON.stringify(data));
                     $scope.ptzMoveCommand = (data.control.Control.CanMoveCon == '1') ? 'moveCon' : 'move';
                     $scope.ptzStopCommand = "moveStop";
-                    console.log("***moveCommand: " + $scope.ptzMoveCommand);
+                    //console.log("***moveCommand: " + $scope.ptzMoveCommand);
                 
                 
                 // presets
@@ -643,7 +643,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                     ZMDataModel.zmLog("ControlDB reports PTZ command to be " + $scope.ptzMoveCommand);
                 })
                 .error(function (data) {
-                    console.log("** Error retrieving move PTZ command");
+                  //  console.log("** Error retrieving move PTZ command");
                     ZMDataModel.zmLog("Error retrieving PTZ command  " + JSON.stringify(data), "error");
                 });
         }
@@ -714,7 +714,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         $scope.packMontage = !$scope.packMontage;
         loginData.packMontage = $scope.packMontage;
         ZMDataModel.setLogin(loginData);
-        console.log ("Switching orientation");
+       // console.log ("Switching orientation");
     };
 
     //---------------------------------------------------------------------
@@ -722,8 +722,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     //---------------------------------------------------------------------
     function scaleMontage() {
         var index = montageIndex;
-        console.log(" MONTAGE INDEX === " + montageIndex);
-        console.log("Scaling Monitor " + index);
+        //console.log(" MONTAGE INDEX === " + montageIndex);
+        //console.log("Scaling Monitor " + index);
         if ($scope.monitorSize[index] == 6)
             $scope.scaleDirection[index] = -1;
 
@@ -732,7 +732,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
         $scope.monitorSize[index] += $scope.scaleDirection[index];
 
-        console.log("Changed size to " + $scope.monitorSize[index]);
+       // console.log("Changed size to " + $scope.monitorSize[index]);
 
         var monsizestring = "";
         var i;
@@ -740,7 +740,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
             monsizestring = monsizestring + $scope.monitorSize[i] + ':';
         }
         monsizestring = monsizestring.slice(0, -1); // kill last :
-        console.log("Setting monsize string:" + monsizestring);
+        //console.log("Setting monsize string:" + monsizestring);
         loginData.montageArraySize = monsizestring;
         ZMDataModel.setLogin(loginData);
         //window.localStorage.setItem("montageArraySize", monsizestring);
@@ -766,7 +766,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     // stop scaling montage window on release
     //---------------------------------------------------------------------
     $scope.onRelease = function (index) {
-        console.log("Press release on " + index);
+      //  console.log("Press release on " + index);
         isLongPressActive = false;
         $interval.cancel(intervalHandleMontage);
     };
@@ -822,19 +822,19 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     };
 
     $scope.$on('$destroy', function () {
-        console.log("*** CANCELLING INTERVAL ****");
+      //  console.log("*** CANCELLING INTERVAL ****");
         $interval.cancel($rootScope.intervalHandle);
     });
 
 
     $scope.$on('$ionicView.loaded', function () {
-        console.log("**VIEW ** Montage Ctrl Loaded");
+      //  console.log("**VIEW ** Montage Ctrl Loaded");
     });
 
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** Montage Ctrl Entered, Starting loadNotifications");
+       // console.log("**VIEW ** Montage Ctrl Entered, Starting loadNotifications");
         var ld = ZMDataModel.getLogin();
-        console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
+        //console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
         ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
 
         $interval.cancel($rootScope.intervalHandle);
@@ -847,13 +847,13 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     });
 
     $scope.$on('$ionicView.leave', function () {
-        console.log("**VIEW ** Montage Ctrl Left, force removing modal");
+       // console.log("**VIEW ** Montage Ctrl Left, force removing modal");
         if ($scope.modal) $scope.modal.remove();
     });
     
     
     $scope.$on('$ionicView.beforeLeave', function () {
-        console.log("**VIEW ** Montage Ctrl Left, force removing modal");
+       // console.log("**VIEW ** Montage Ctrl Left, force removing modal");
         
         
         ZMDataModel.zmLog ("MontageCtrl:Stopping network pull...");
@@ -878,22 +878,22 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         if (sizeInProgress) return;
 
         sizeInProgress = true;
-        console.log('Size has changed');
+       // console.log('Size has changed');
         ZMDataModel.setMontageSize(val);
-        console.log("ZMData Montage is " + ZMDataModel.getMontageSize() +
-            " and slider montage is " + $scope.slider.monsize);
+       // console.log("ZMData Montage is " + ZMDataModel.getMontageSize() +
+         //   " and slider montage is " + $scope.slider.monsize);
         // Now go ahead and reset sizes of entire monitor array
         var monsizestring = "";
         var i;
         for (i = 0; i < $scope.monitors.length; i++) {
 
             $scope.monitorSize[i] = parseInt(ZMDataModel.getMontageSize());
-            console.log("Resetting Monitor " + i + " size to " + $scope.monitorSize[i]);
+           // console.log("Resetting Monitor " + i + " size to " + $scope.monitorSize[i]);
             $scope.scaleDirection[i] = 1;
             monsizestring = monsizestring + $scope.monitorSize[i] + ':';
         }
         monsizestring = monsizestring.slice(0, -1); // kill last :
-        console.log("Setting monsize string:" + monsizestring);
+        //console.log("Setting monsize string:" + monsizestring);
         loginData.montageArraySize = monsizestring;
         ZMDataModel.setLogin(loginData);
         //window.localStorage.setItem("montageArraySize", monsizestring);
@@ -948,7 +948,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
 
 
-        console.log("***Pull to Refresh, recomputing Rand");
+       // console.log("***Pull to Refresh, recomputing Rand");
         ZMDataModel.zmLog("Reloading view for montage view, recomputing rand");
         $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
         $scope.monitors = [];
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 8aac1795..2046ffcc 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -84,24 +84,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     /* Note this is also called when the view is first loaded */
     function footerCollapse()
     {
+        if (readyToRun == false)
+        {
+            ZMDataModel.zmDebug ("fake call to footerCollapse - ignoring");
+            return;
+        }
         
-        for ( i=0; i< $scope.MontageMonitors.length; i++)
-          {
-              //$scope.MontageMonitors[i].Monitor.connKey='';
-              
-              if ($scope.MontageMonitors[i].Monitor.connKey == "")
-              {
-                ZMDataModel.zmDebug("First time connkey Init");
-                $scope.MontageMonitors[i].Monitor.connKey =  (Math.floor((Math.random() * 999999) + 1)).toString();
-                $scope.MontageMonitors[i].Monitor.eventUrl ='img/noevent.png';
-                $scope.MontageMonitors[i].Monitor.eventUrlTime="";
-                $scope.MontageMonitors[i].Monitor.isPaused=false;
-                   
-              }
-          }
-        
-        
-                
+        window.stop();
+        var ld = ZMDataModel.getLogin();
         
         $scope.sliderVal.realRate = $scope.sliderVal.rate *100;
         //ZMDataModel.zmDebug ("Playback rate is:"  + $scope.sliderVal.realRate);
@@ -109,7 +99,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         var TimeObjectFrom = moment($scope.datetimeValueFrom.value).format("YYYY-MM-DD HH:mm");
         var TimeObjectTo = moment($scope.datetimeValueTo.value).format('YYYY-MM-DD HH:mm');
       
-        console.log ("TIME START: " + TimeObjectFrom + " " + TimeObjectTo);
+       // console.log ("TIME START: " + TimeObjectFrom + " " + TimeObjectTo);
+        //console.log ("TIME START: " + TimeObjectFrom + " " + TimeObjectTo);
             
         
          var apiurl;
@@ -125,12 +116,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 timedControlEventStream(2500,17,"",tmpCK,-1);
                 $scope.MontageMonitors[i].Monitor.eventUrl = "img/noevent.png";    
                 $scope.MontageMonitors[i].Monitor.connKey =  (Math.floor((Math.random() * 999999) + 1)).toString();
-                console.log ("Generating connkey: " +$scope.MontageMonitors[i].Monitor.connKey);
+                //console.log ("Generating connkey: " +$scope.MontageMonitors[i].Monitor.connKey);
             }
             
             else
             {
-                console.log ("footerCollapse: Skipped kill: connkey:"+$scope.MontageMonitors[i].Monitor.connKey + " function " + $scope.MontageMonitors[i].Monitor.Function + " listDisplay " + $scope.MontageMonitors[i].Monitor.lisDisplay + " enabled " + $scope.MontageMonitors[i].Monitor.Enabled + " eventURL " + $scope.MontageMonitors[i].Monitor.eventUrl);
+                //console.log ("footerCollapse: Skipped kill: connkey:"+$scope.MontageMonitors[i].Monitor.connKey + " function " + $scope.MontageMonitors[i].Monitor.Function + " listDisplay " + $scope.MontageMonitors[i].Monitor.lisDisplay + " enabled " + $scope.MontageMonitors[i].Monitor.Enabled + " eventURL " + $scope.MontageMonitors[i].Monitor.eventUrl);
             }
             
             
@@ -146,7 +137,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             $http.get(apiurl)
             .success( function(data) {
                 
-                
+                var ld = ZMDataModel.getLogin();
                 ZMDataModel.zmDebug ("Got "+data.events.length+"new history events...");
                 var eid, mid, stime;
                 for (i=0; i<data.events.length; i++)
@@ -167,8 +158,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
                                    // console.log ("Old value of event url " + $scope.MontageMonitors[j].eventUrl);
                                //console.log ("ldurl is " + ld.streamingurl);
-                                    $scope.MontageMonitors[j].Monitor.eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+eid+"&frame=1&replay=gapless";
-                                    console.log ("Setting event URL to " +$scope.MontageMonitors[j].Monitor.eventUrl);
+                                    $scope.MontageMonitors[j].Monitor.eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+eid+"&frame=1&replay=gapless&rate="+$scope.sliderVal.realRate+"&connkey="+$scope.MontageMonitors[j].Monitor.connKey+"&scale="+ld.singleImageQuality+"&rand="+$rootScope.rand;
+                                    //console.log ("Setting event URL to " +$scope.MontageMonitors[j].Monitor.eventUrl);
 
                                    //   console.log ("SWITCHING TO " + $scope.MontageMonitors[j].eventUrl);
 
@@ -222,7 +213,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                     if (!ZMDataModel.isBackground())
                     {
 
-                        $scope.MontageMonitors[i].Monitor.eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.events[0].Event.Id+"&frame=1&replay=gapless";
+                        $scope.MontageMonitors[i].Monitor.eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.events[0].Event.Id+"&frame=1&replay=gapless&rate="+$scope.sliderVal.realRate+"&connkey="+$scope.MontageMonitors[i].Monitor.connKey+"&scale="+ld.singleImageQuality+"&rand="+$rootScope.rand;
+                        
+                    
+                        
                          //console.log ("SWITCHING TO " + $scope.MontageMonitors[i].eventUrl);
                         
                         $scope.MontageMonitors[i].Monitor.eventUrlTime = data.events[0].Event.StartTime;
@@ -277,7 +271,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     $scope.dateChanged = function()
     {
        // window.stop();
-        console.log (">>>>>>>>>>>>>>>>>>>>>>>>>>>>> BAD BAD");
+       // console.log (">>>>>>>>>>>>>>>>>>>>>>>>>>>>> BAD BAD");
         footerCollapse();
     };
     
@@ -322,7 +316,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                         str.push(encodeURIComponent(p) + "=" +
                             encodeURIComponent(obj[p]));
                     var foo = str.join("&");
-                    console.log("****SUB RETURNING " + foo);
+                    //console.log("****SUB RETURNING " + foo);
                     return foo;
                 },
 
@@ -423,7 +417,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             });
             req.success(function (resp) {
 
-                console.log("SUCCESS FOR: " + JSON.stringify(resp));
+               // console.log("SUCCESS FOR: " + JSON.stringify(resp));
                
                 if (resp.result=="Ok" && ndx != -1)
                 {   
@@ -448,7 +442,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                                          element.addClass('animated flipInX');
                                         $scope.MontageMonitors[ndx].Monitor.eventUrlTime=data.event.Event.StartTime;
                                         
-                                        $scope.MontageMonitors[ndx].Monitor.eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.event.Event.Id+"&frame=1&replay=gapless";
+                                        $scope.MontageMonitors[ndx].Monitor.eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.event.Event.Id+"&frame=1&replay=gapless&rate="+$scope.sliderVal.realRate+"&connkey="+$scope.MontageMonitors[ndx].Monitor.connKey+"&scale="+ld.singleImageQuality+"&rand="+$rootScope.rand;
                                     },700);
                                
                         }
@@ -485,6 +479,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     $scope.displayDateTimeSliders = true;
     $scope.showtimers = true;
     var curYear = new Date().getFullYear();
+    var readyToRun = false;
     
     $scope.sliderVal = {
        
@@ -618,6 +613,23 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     $scope.packMontage = loginData.packMontage;
     
     
+    // init monitors
+    ZMDataModel.zmDebug(">>Initializing connkeys and images...");
+    for ( i=0; i< $scope.MontageMonitors.length; i++)
+          {
+              //$scope.MontageMonitors[i].Monitor.connKey='';
+              
+              
+                
+                $scope.MontageMonitors[i].Monitor.connKey =  (Math.floor((Math.random() * 999999) + 1)).toString();
+                $scope.MontageMonitors[i].Monitor.eventUrl ='img/noevent.png';
+                $scope.MontageMonitors[i].Monitor.eventUrlTime="";
+                $scope.MontageMonitors[i].Monitor.isPaused=false;
+                   
+       
+          }
+    readyToRun = true;
+    
     
     
     // --------------------------------------------------------
@@ -732,7 +744,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     ZMDataModel.getAuthKey($rootScope.validMonitorId)
         .then(function (success) {
                 $ionicLoading.hide();
-                console.log(success);
+                //console.log(success);
                 $rootScope.authSession = success;
                 ZMDataModel.zmLog("Stream authentication construction: " +
                     $rootScope.authSession);
@@ -771,7 +783,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
 
     $scope.closeReorderModal = function () {
-        console.log("Close & Destroy Monitor Modal");
+        //console.log("Close & Destroy Monitor Modal");
         // switch off awake, as liveview is finished
         //ZMDataModel.setAwake(false);
         $scope.modal.remove();
diff --git a/www/js/NewsCtrl.js b/www/js/NewsCtrl.js
index a84cbdfc..a0ab8565 100644
--- a/www/js/NewsCtrl.js
+++ b/www/js/NewsCtrl.js
@@ -31,7 +31,7 @@ $scope.openMenu = function () {
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** News Ctrl Entered");
+       // console.log("**VIEW ** News Ctrl Entered");
         ZMDataModel.setAwake(false);
         
         
@@ -53,6 +53,8 @@ $scope.openMenu = function () {
     $scope.loadPost = function (item, itemdate)
     {
         var lastDate = $localstorage.get("latestBlogPostChecked");
+        
+        
         if (!lastDate)
         {
             ZMDataModel.zmDebug ("First time checking blog posts, I see");
@@ -89,7 +91,7 @@ $scope.openMenu = function () {
         .success (function(data)
         {
             //console.log ("Here2");
-            console.log (JSON.stringify(data));
+           // console.log (JSON.stringify(data));
             for (var i=0; i<data.length; i++)
             {
                 $scope.newsItems.push({title:data[i].title, url:data[i].url, date:data[i].date});
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 0ef20705..d0c94f32 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -251,7 +251,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                         {
                             $rootScope.tappedNotification = 0;
                             $ionicHistory.nextViewOptions({disableBack: true});		
-                               console.log ("***** NOTIFICATION TAPPED GOING TO EVENTS ");
+                               //console.log ("***** NOTIFICATION TAPPED GOING TO EVENTS ");
                             $state.go("events", {"id": 0}, { reload: true });
                             return;
                             
@@ -259,7 +259,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                 
                         if ($rootScope.lastState == 'lowversion') $rootScope.lastState = 'montage';
                         ZMDataModel.zmDebug("Transitioning state to: " + $rootScope.lastState ? $rootScope.lastState : 'montage');
-                        console.log ("*********** GOING TO " + $rootScope.lastState);
+                        //console.log ("*********** GOING TO " + $rootScope.lastState);
                         $state.go($rootScope.lastState ? $rootScope.lastState : 'montage', $rootScope.lastStateParam);
                     },
                     // coming here means auth error
@@ -298,7 +298,8 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     //-------------------------------------------------------------------------------
     // Controller Main
     //-------------------------------------------------------------------------------
-    console.log("************* ENTERING PORTAL MAIN ");
+   // console.log("************* ENTERING PORTAL MAIN ");
+    ZMDataModel.zmLog ("Entering Portal Main");
     var loginData = ZMDataModel.getLogin();
      $ionicSideMenuDelegate.canDragContent(false);
 
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index c6a9c9ba..97fd234a 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -63,7 +63,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
-        console.log("**VIEW ** Montage Ctrl Entered");
+       // console.log("**VIEW ** Montage Ctrl Entered");
         ZMDataModel.setAwake(false);
     });
 
@@ -122,7 +122,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
         $scope.myopt = {
             selectedState: ""
         };
-        console.log(JSON.stringify($scope.allStateNames));
+        //console.log(JSON.stringify($scope.allStateNames));
         ZMDataModel.zmLog("List of custom states: " + JSON.stringify($scope.allStateNames));
         $rootScope.zmPopup = $ionicPopup.show({
             scope: $scope,
@@ -152,7 +152,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
         // It seems invoking a popup within a popup handler
         // causes issues. Doing this outside due to that reason
         $rootScope.zmPopup.then(function (res) {
-            console.log("GOT : " + JSON.stringify(res));
+           // console.log("GOT : " + JSON.stringify(res));
             if (res == "OK") {
                 if ($scope.myopt.selectedState != "")
                     controlZM($scope.myopt.selectedState);
@@ -182,7 +182,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
                 },
                 function (error) {
                     $scope.zmDisk = "unknown";
-                    console.log("ERROR:" + JSON.stringify(error));
+                   // console.log("ERROR:" + JSON.stringify(error));
                     ZMDataModel.zmLog("Error retrieving DiskStatus: " + JSON.stringify(error), "error");
                 }
             );
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index f12cb077..8f0a8057 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -15,7 +15,7 @@
 
 angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', 'message', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', '$ionicContentBanner', '$ionicHistory', '$sce', '$stateParams', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, message, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, $ionicContentBanner, $ionicHistory, $sce, $stateParams) {
 
-    console.log("Inside Timeline controller");
+    //console.log("Inside Timeline controller");
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -66,7 +66,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
 
     $scope.toggleMinAlarmFrameCount = function () {
-        console.log("Toggling");
+       // console.log("Toggling");
 
         var ld = ZMDataModel.getLogin();
         ld.minAlarmCount = ld.minAlarmCount == "0" ? "1" : "0";
@@ -181,7 +181,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     //-------------------------------------------------------------------------
     function onPause() {
         ZMDataModel.zmDebug("TimelineCtrl:onpause called");
-        console.log("*** Moving to Background ***"); // Handle the pause event
+       // console.log("*** Moving to Background ***"); // Handle the pause event
 
         if ($scope.popover) $scope.popover.remove();
 
@@ -224,7 +224,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     // graph range
     //-------------------------------------------------
     $scope.$on('$ionicView.afterEnter', function () {
-        console.log("***AFTER ENTER");
+       // console.log("***AFTER ENTER");
 
         var tempMon = message;
 
@@ -238,17 +238,17 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         } else
             $scope.monitors = message;
         if ($rootScope.customTimelineRange) {
-            console.log("***** CUSTOM RANGE");
+           // console.log("***** CUSTOM RANGE");
             if (moment($rootScope.fromString).isValid() &&
                 moment($rootScope.toString).isValid()) {
-                console.log("FROM & TO IS CUSTOM");
+               // console.log("FROM & TO IS CUSTOM");
                 fromDate = $rootScope.fromString;
                 toDate = $rootScope.toString;
                 $scope.fromDate = fromDate;
                 $scope.toDate = toDate;
                 drawGraph(fromDate, toDate, maxItems);
             } else {
-                console.log("FROM & TO IS CUSTOM INVALID");
+              //  console.log("FROM & TO IS CUSTOM INVALID");
             }
         } else {
             drawGraph(fromDate, toDate, maxItems);
@@ -308,7 +308,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     $scope.toDate = toDate;
 
 
-    console.log("*********************** TIMELINE MAIN ");
+   // console.log("*********************** TIMELINE MAIN ");
 
     // maxItems will be ignored during timeline draw if its desktop
      var maxItemsConf = ($rootScope.platformOS == 'desktop') ? zm.graphDesktopItemMax: zm.graphItemMax; 
@@ -624,7 +624,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                         showDelay: 0,
                                         duration: 1500,
                                     });
-                                    console.log("Zoomed out too far to playback events");
+                                   // console.log("Zoomed out too far to playback events");
                                 }
 
                             });