1 files changed, 51 insertions, 55 deletions

diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 4e217464..80758cdd 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -1,80 +1,79 @@
 // controller for Monitor View
+// refer to comments in EventCtrl for the modal stuff. They are almost the same
 
-angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', function ($scope, ZMDataModel, message,$ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $ionicLoading) {
+angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', function ($scope, ZMDataModel, message, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $ionicLoading) {
 
     $scope.monitors = [];
 
 
-$scope.openMenu = function () {
-    $ionicSideMenuDelegate.toggleLeft();
-  }
+    $scope.openMenu = function () {
+        $ionicSideMenuDelegate.toggleLeft();
+    }
 
-$scope.reloadView = function ()
-{
-    console.log ("*** Refreshing Modal view ***");
-     $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
-    $ionicLoading.show({
-                template: "refreshed view",
-                noBackdrop: true,
-                duration: 2000
-            });
-}
+    $scope.reloadView = function () {
+        console.log("*** Refreshing Modal view ***");
+        $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+        $ionicLoading.show({
+            template: "refreshed view",
+            noBackdrop: true,
+            duration: 2000
+        });
+    }
 
-$scope.isSimulated = function () {
+    $scope.isSimulated = function () {
         return ZMDataModel.isSimulated();
     };
 
-
-$scope.finishedLoadingImage = function()
-    {
-        console.log ("***Monitor image FINISHED Loading***");
+    // same logic as EventCtrl.js
+    $scope.finishedLoadingImage = function () {
+        console.log("***Monitor image FINISHED Loading***");
         $ionicLoading.hide();
-       /* $ionicLoading.show({
-            template: "loading, please wait...",
-            noBackdrop: true,
-        });*/
+        /* $ionicLoading.show({
+             template: "loading, please wait...",
+             noBackdrop: true,
+         });*/
     }
 
-   
 
- $scope.$on('$ionicView.loaded', function(){
-    console.log("**VIEW ** Monitor Ctrl Loaded");
-  });
 
-    $scope.$on('$ionicView.enter', function(){
-    console.log("**VIEW ** Monitor Ctrl Entered");
-  });
+    $scope.$on('$ionicView.loaded', function () {
+        console.log("**VIEW ** Monitor Ctrl Loaded");
+    });
+
+    $scope.$on('$ionicView.enter', function () {
+        console.log("**VIEW ** Monitor Ctrl Entered");
+    });
 
-      $scope.$on('$ionicView.leave', function(){
-    console.log("**VIEW ** Monitor Ctrl Left");
-  });
+    $scope.$on('$ionicView.leave', function () {
+        console.log("**VIEW ** Monitor Ctrl Left");
+    });
 
-         $scope.$on('$ionicView.unloaded', function(){
-    console.log("**VIEW ** Monitor Ctrl Unloaded");
-  });
+    $scope.$on('$ionicView.unloaded', function () {
+        console.log("**VIEW ** Monitor Ctrl Unloaded");
+    });
 
- $scope.openModal = function (mid) {
+    $scope.openModal = function (mid) {
         console.log("Open Monitor Modal");
 
         $scope.monitorId = mid;
         $scope.LoginData = ZMDataModel.getLogin();
         $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
 
-     // This is a modal to show the monitor footage
-    $ionicModal.fromTemplateUrl('templates/monitors-modal.html', {
-            scope: $scope,
-            animation: 'slide-in-up'
-        })
-        .then(function (modal) {
-            $scope.modal = modal;
-
-         $ionicLoading.show({
-                template: "please wait...",
-                noBackdrop: true,
-                duration:10000
-        })
-            $scope.modal.show();
-        });
+        // This is a modal to show the monitor footage
+        $ionicModal.fromTemplateUrl('templates/monitors-modal.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            })
+            .then(function (modal) {
+                $scope.modal = modal;
+
+                $ionicLoading.show({
+                    template: "please wait...",
+                    noBackdrop: true,
+                    duration: 15000
+                })
+                $scope.modal.show();
+            });
 
     };
     $scope.closeModal = function () {
@@ -93,9 +92,6 @@ $scope.finishedLoadingImage = function()
     console.log("***EVENTS: Waiting for Monitors to load before I proceed");
 
     $scope.monitors = message;
-    // console.log("I GOT " + $scope.monitors);
-
-    console.log("HERE");
 
     $scope.doRefresh = function () {
         console.log("***Pull to Refresh");