summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/LoginCtrl.js3
-rwxr-xr-xwww/js/app.js5
2 files changed, 8 insertions, 0 deletions
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();
+
+
}
}