mostly formatting and removal of console.logs

Former-commit-id: 5cbac40ad5ccb7096fb7b9f58696e923ba282232

1 files changed, 199 insertions, 197 deletions

diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index da122d0c..c8e92be6 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -3,12 +3,11 @@
 /*This is for the loop closure I am using in line 143 */
 /* jslint browser: true*/
 /* global vis,cordova,StatusBar,angular,console,moment */
-angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID',  'EventServer', '$translate',function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID,  EventServer, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID', 'EventServer', '$translate', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID, EventServer, $translate) {
 
 
     $scope.$on('$ionicView.enter',
-        function () 
-        {
+        function () {
 
             ZMDataModel.zmDebug("Inside Portal login Enter handler");
             loginData = ZMDataModel.getLogin();
@@ -16,7 +15,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
             $ionicHistory.nextViewOptions({
                 disableBack: true
             });
-        
+
 
             $scope.pindata = {};
             if ($ionicSideMenuDelegate.isOpen()) {
@@ -29,8 +28,8 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
 
             if (ZMDataModel.isLoggedIn()) {
                 ZMDataModel.zmLog("User credentials are provided");
-                
-                
+
+
 
                 // You can login either via touch ID or typing in your code     
                 if ($ionicPlatform.is('ios') && loginData.usePin) {
@@ -50,8 +49,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                         }, function (error) {
                             ZMDataModel.zmLog("TouchID not supported");
                         });
-                } 
-                else // touch was not used
+                } else // touch was not used
                 {
                     ZMDataModel.zmLog("not checking for touchID");
                 }
@@ -61,38 +59,32 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                     $scope.pinPrompt = true;
                     // dont call unlock, let the user type in code
 
-                } 
-                else // no PIN Code so go directly to auth
+                } else // no PIN Code so go directly to auth
                 {
-                    
+
                     unlock(true);
                 }
 
-            } 
-            else // login creds are not present
+            } else // login creds are not present
             {
                 ZMDataModel.zmDebug("PortalLogin: Not logged in, so going to login");
-                if (ZMDataModel.isFirstUse())
-                {
-                    ZMDataModel.zmDebug ("First use, showing warm and fuzzy...");
+                if (ZMDataModel.isFirstUse()) {
+                    ZMDataModel.zmDebug("First use, showing warm and fuzzy...");
                     $ionicHistory.nextViewOptions({
                         disableAnimate: true,
                         disableBack: true
                     });
                     $state.go('first-use');
-                }
-                else
-                {
-                    if (!$rootScope.userCancelledAuth)
-                    {
-                            $ionicHistory.nextViewOptions({
-                                disableAnimate: true,
+                } else {
+                    if (!$rootScope.userCancelledAuth) {
+                        $ionicHistory.nextViewOptions({
+                            disableAnimate: true,
                             disableBack: true
-                            });
-                            $state.go("login" ,{"wizard": false});
-                    }
-                    else   
-                    {
+                        });
+                        $state.go("login", {
+                            "wizard": false
+                        });
+                    } else {
                         // do this only once - rest for next time
                         $rootScope.userCancelledAuth = false;
                     }
@@ -118,70 +110,72 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
         // call with false meaning check for pin
         unlock(false);
     };
-    
-        
+
+
     //------------------------------------------------------------------------
     // Aaron Lager hack - can't figure out why he gets a 401 after
     // successful login and then it works after resaving
     //------------------------------------------------------------------------
-    function tryLoggingSecondTimeHack()
-    {
+    function tryLoggingSecondTimeHack() {
         var d = $q.defer();
-        
-        zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;"+$translate.instant('kAuthenticating')+"...</button>")
-                .then(function (data) // success
+
+        zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;" + $translate.instant('kAuthenticating') + "...</button>")
+            .then(function (data) // success
                 {
-                    ZMDataModel.zmDebug ("2nd auth login worked");
+                    ZMDataModel.zmDebug("2nd auth login worked");
                     ZMDataModel.getAPIversion()
-                    .then (function (data) {
-                        ZMDataModel.getKeyConfigParams(1);
-                        ZMDataModel.zmLog("2nd auth:Got API version: " + data);
-                        $rootScope.apiVersion = data;
-                        var ld = ZMDataModel.getLogin();
-                         if (ZMDataModel.versionCompare(data,zm.minAppVersion)==-1 && data !="0.0.0")
-                        {
+                        .then(function (data) {
+                                ZMDataModel.getKeyConfigParams(1);
+                                ZMDataModel.zmLog("2nd auth:Got API version: " + data);
+                                $rootScope.apiVersion = data;
+                                var ld = ZMDataModel.getLogin();
+                                if (ZMDataModel.versionCompare(data, zm.minAppVersion) == -1 && data != "0.0.0") {
+
+                                    $state.go('lowversion', {
+                                        "ver": data
+                                    });
+                                }
 
-                            $state.go('lowversion', {"ver":data});
-                        }
+                                if (ZMDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") {
 
-                        if (ZMDataModel.versionCompare(data,zm.recommendedAppVersion)==-1 && data !="0.0.0")
-                        {
+                                    $state.go('importantmessage', {
+                                        "ver": data
+                                    });
+                                }
+
+                                if (data == "0.0.0") {
+
+                                    ZMDataModel.zmLog("2nd Auth:API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
+                                    ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
+                                    $state.go("login", {
+                                        "wizard": false
+                                    });
+
+                                }
+                                // coming here means continue
+                                EventServer.refresh();
+                                var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage';
+                                //ZMDataModel.zmDebug ("logging state transition");
+                                ZMDataModel.zmDebug("2nd Auth: Transitioning state to: " +
+                                    statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam));
+                                $state.go(statetoGo, $rootScope.lastStateParam);
+
+                            },
+                            function (error) {
+                                ZMDataModel.zmDebug("2nd auth API failed, going to login");
+                                d.reject("failed 2nd auth");
+                                return (d.promise);
+
+                            });
+
+
+                },
+                function (error) {
+                    ZMDataModel.zmDebug("2nd auth hack failed, going to login");
+                    d.reject("failed 2nd auth");
+                    return (d.promise);
+                });
 
-                            $state.go('importantmessage', {"ver":data});
-                        }
-                        
-                        if (data == "0.0.0")
-                        {
-                         
-                            ZMDataModel.zmLog ("2nd Auth:API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
-                             ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
-                            $state.go("login" ,{"wizard": false});
-                            
-                        }
-                        // coming here means continue
-                        EventServer.refresh();
-                        var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage';
-                        //ZMDataModel.zmDebug ("logging state transition");
-                        ZMDataModel.zmDebug("2nd Auth: Transitioning state to: " + 
-                                           statetoGo + " with param " +JSON.stringify($rootScope.lastStateParam) );
-                        $state.go(statetoGo, $rootScope.lastStateParam);
-                        
-                    },
-                           function (error) {
-                            ZMDataModel.zmDebug ("2nd auth API failed, going to login");
-                            d.reject("failed 2nd auth");
-                            return (d.promise);
-                        
-                    });
-        
-            
-        },
-        function (error) {
-            ZMDataModel.zmDebug ("2nd auth hack failed, going to login");
-            d.reject("failed 2nd auth");
-            return (d.promise);
-        });
-        
         return (d.promise);
     }
 
@@ -190,133 +184,141 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
         idVerified == true means no pin check needed
                    == false means check PIN
         */
-        
-        ZMDataModel.zmDebug("unlock called with check PIN="+idVerified);
-        if (idVerified || ($scope.pindata.pin == loginData.pinCode)) 
-        {
+
+        ZMDataModel.zmDebug("unlock called with check PIN=" + idVerified);
+        if (idVerified || ($scope.pindata.pin == loginData.pinCode)) {
             ZMDataModel.zmDebug("PIN code entered is correct, or there is no PIN set");
             $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
             zmAutoLogin.stop(); //safety
             zmAutoLogin.start();
-            
+
             // PIN is fine, or not set so lets login
-            zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;"+$translate.instant('kAuthenticating')+"...</button>")
+            zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;" + $translate.instant('kAuthenticating') + "...</button>")
                 .then(function (data) // success
-                {
-                    ZMDataModel.zmDebug("PortalLogin: auth success");
-                    ZMDataModel.getKeyConfigParams(1);
-                    // $state.go("login" ,{"wizard": false});
-                    //login was ok, so get API details
-                    ZMDataModel.getAPIversion()
-                    .then (function(data) {
-                        ZMDataModel.zmLog("Got API version: " + data);
-                        $rootScope.apiVersion = data;
-                        var ld = ZMDataModel.getLogin();
-                         if (ZMDataModel.versionCompare(data,zm.minAppVersion)==-1 && data !="0.0.0")
-                        {
-
-                            $state.go('lowversion', {"ver":data});
-                        }
-
-                        if (ZMDataModel.versionCompare(data,zm.recommendedAppVersion)==-1 && data !="0.0.0")
-                        {
+                    {
+                        ZMDataModel.zmDebug("PortalLogin: auth success");
+                        ZMDataModel.getKeyConfigParams(1);
+                        // $state.go("login" ,{"wizard": false});
+                        //login was ok, so get API details
+                        ZMDataModel.getAPIversion()
+                            .then(function (data) {
+                                    ZMDataModel.zmLog("Got API version: " + data);
+                                    $rootScope.apiVersion = data;
+                                    var ld = ZMDataModel.getLogin();
+                                    if (ZMDataModel.versionCompare(data, zm.minAppVersion) == -1 && data != "0.0.0") {
+
+                                        $state.go('lowversion', {
+                                            "ver": data
+                                        });
+                                    }
+
+                                    if (ZMDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") {
+
+                                        $state.go('importantmessage', {
+                                            "ver": data
+                                        });
+                                    }
+
+                                    if (data == "0.0.0") {
+
+                                        ZMDataModel.zmLog("API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
+                                        ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
+                                        $state.go("login", {
+                                            "wizard": false
+                                        });
+
+                                    }
+                                    // coming here means continue
+                                    EventServer.refresh();
+                                    var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage';
+                                    ZMDataModel.zmDebug("logging state transition");
+                                    ZMDataModel.zmDebug("Transitioning state to: " +
+                                        statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam));
+                                    $state.go(statetoGo, $rootScope.lastStateParam);
+
+                                },
+                                function (error) { // API Error
+                                    ZMDataModel.zmLog("API Error handler: going to login getAPI returned error: " + JSON.stringify(error));
+                                    //ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
+
+                                    ZMDataModel.zmDebug("Doing the Aaron Hack after 1 sec....");
+                                    $timeout(function () {
+                                        tryLoggingSecondTimeHack()
+                                            .then(function success(s) {
+                                                    ZMDataModel.zmLog("2nd time login hack worked!, nothing to do");
+                                                },
+                                                function error(e) {
+                                                    $state.go("login", {
+                                                        "wizard": false
+                                                    });
+                                                });
+
+                                    }, 1000);
+
+                                });
+
+
+                        if ($rootScope.tappedNotification) {
+
+
+                            var ld = ZMDataModel.getLogin();
+                            ZMDataModel.zmLog("Came via push tap. onTapScreen=" + ld.onTapScreen);
+                            //console.log ("***** NOTIFICATION TAPPED  ");
+                            $rootScope.tappedNotification = 0;
+                            $ionicHistory.nextViewOptions({
+                                disableBack: true
+                            });
 
-                            $state.go('importantmessage', {"ver":data});
-                        }
-                        
-                        if (data == "0.0.0")
-                        {
-                         
-                            ZMDataModel.zmLog ("API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
-                             ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
-                            $state.go("login" ,{"wizard": false});
-                            
+                            if (ld.onTapScreen == $translate.instant('kTapMontage')) {
+                                ZMDataModel.zmDebug("Going to montage");
+                                $state.go("montage", {}, {
+                                    reload: true
+                                });
+
+                                return;
+                            } else if (ld.onTapScreen == $translate.instant('kTapEvents')) {
+                                ZMDataModel.zmDebug("Going to events");
+                                $state.go("events", {
+                                    "id": 0
+                                }, {
+                                    reload: true
+                                });
+                                return;
+                            } else // we go to live
+                            {
+                                ZMDataModel.zmDebug("Going to live view ");
+                                $state.go("monitors", {}, {
+                                    reload: true
+                                });
+                                return;
+                            }
                         }
-                        // coming here means continue
-                        EventServer.refresh();
-                        var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage';
-                        ZMDataModel.zmDebug ("logging state transition");
-                        ZMDataModel.zmDebug("Transitioning state to: " + 
-                                           statetoGo + " with param " +JSON.stringify($rootScope.lastStateParam) );
-                        $state.go(statetoGo, $rootScope.lastStateParam);
-                        
-                        },
-                       function (error) { // API Error
-                            ZMDataModel.zmLog ("API Error handler: going to login getAPI returned error: " + JSON.stringify(error));
-                             //ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
-                        
-                            ZMDataModel.zmDebug ("Doing the Aaron Hack after 1 sec....");
-                            $timeout ( function () {
-                            tryLoggingSecondTimeHack()
-                            .then (function success(s) {
-                                ZMDataModel.zmLog ("2nd time login hack worked!, nothing to do");
-                            },
-                            function error(e) {
-                                $state.go("login" ,{"wizard": false});
-                            });
-                        
-                            },1000);
 
-                       });
-                    
 
-                    if ($rootScope.tappedNotification)
-                    {
-                        
-                       
-                        var ld = ZMDataModel.getLogin();
-                         ZMDataModel.zmLog ("Came via push tap. onTapScreen="+ld.onTapScreen);
-                        //console.log ("***** NOTIFICATION TAPPED  ");
-                        $rootScope.tappedNotification = 0;
-                        $ionicHistory.nextViewOptions({disableBack: true});	
-
-                        if (ld.onTapScreen == $translate.instant('kTapMontage') )
-                        {
-                            ZMDataModel.zmDebug("Going to montage");
-                            $state.go("montage", {}, { reload: true });
-
-                            return;
-                        }
-                        else if (ld.onTapScreen == $translate.instant ('kTapEvents'))
-                        {
-                            ZMDataModel.zmDebug("Going to events");
-                            $state.go("events", {"id": 0}, { reload: true });
-                            return;
-                        }
-                        else // we go to live
-                        {
-                            ZMDataModel.zmDebug("Going to live view ");
-                            $state.go("monitors", {}, { reload: true });
-                            return;
-                        }
-                    }
-                    
-                    
-                },
+                    },
                     // coming here means auth error
                     // so go back to login
-                function (error) {
-                    ZMDataModel.zmDebug("PortalLogin: error authenticating " +
-                        JSON.stringify(error));
-                    if (!$rootScope.userCancelledAuth)
-                    {
+                    function (error) {
+                        ZMDataModel.zmDebug("PortalLogin: error authenticating " +
+                            JSON.stringify(error));
+                        if (!$rootScope.userCancelledAuth) {
                             ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed', 'Please check API settings']);
                             $ionicHistory.nextViewOptions({
                                 disableAnimate: true,
-                            disableBack: true
+                                disableBack: true
                             });
-                            $state.go("login" ,{"wizard": false});
-                    }
-                    else   
-                    {
-                        // if user cancelled auth I guess we go to login
-                        $rootScope.userCancelledAuth = false;
-                        $state.go("login" ,{"wizard": false});
-                    }
-                });
-        } 
-        else 
-        {
+                            $state.go("login", {
+                                "wizard": false
+                            });
+                        } else {
+                            // if user cancelled auth I guess we go to login
+                            $rootScope.userCancelledAuth = false;
+                            $state.go("login", {
+                                "wizard": false
+                            });
+                        }
+                    });
+        } else {
             $scope.pindata.status = "Invalid PIN";
 
             // wobble the input box on error
@@ -333,11 +335,11 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     //-------------------------------------------------------------------------------
     // Controller Main
     //-------------------------------------------------------------------------------
-   // console.log("************* ENTERING PORTAL MAIN ");
-    ZMDataModel.zmLog ("Entering Portal Main");
+    // console.log("************* ENTERING PORTAL MAIN ");
+    ZMDataModel.zmLog("Entering Portal Main");
     var loginData;
-     $ionicSideMenuDelegate.canDragContent(true);
+    $ionicSideMenuDelegate.canDragContent(true);
+
 
-        
 
     }]);
\ No newline at end of file