From 85e4e5326e79c5f5304a25e31f129b69ed647a8d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 11 Feb 2017 18:05:03 -0500
Subject: various fixes for the odd "no connection" issue

---
 www/js/LoginCtrl.js | 3 +++
 www/js/app.js       | 5 +++++
 2 files changed, 8 insertions(+)

(limited to 'www/js')

diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 5424dbd4..300e4fbf 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -638,9 +638,12 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
         // lets logout
         NVRDataModel.debug("Logging out of current session...");
         $rootScope.authSession = "undefined";
+
+        
         $http(
             {
                 method: 'POST',
+                timeout:10000,
                 //withCredentials: true,
                 url: $scope.loginData.url + '/index.php',
                 headers:
diff --git a/www/js/app.js b/www/js/app.js
index f7bc5e69..9d8e4994 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -623,6 +623,7 @@ angular.module('zmApp', [
 .factory('timeoutHttpIntercept', ['$rootScope', '$q', 'zm', '$injector', function($rootScope, $q, zm, $injector)
 {
     $rootScope.zmCookie = "";
+    //console.log ("HHHHHHHHHHHHHH**************************");
 
     return {
 
@@ -1514,6 +1515,8 @@ angular.module('zmApp', [
 
             $rootScope.platformOS = "desktop";
             NVRDataModel.log("Device is ready");
+
+
             // var ld = NVRDataModel.getLogin();
             if ($ionicPlatform.is('ios'))
                 $rootScope.platformOS = "ios";
@@ -1821,6 +1824,8 @@ angular.module('zmApp', [
                     NVRDataModel.log("Setting up POST LOGIN timer");
                     zmAutoLogin.start();
                     setupPauseAndResume();
+
+
                 }
 
             }
-- 
cgit v1.2.3