diff options
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 12 | ||||
| -rwxr-xr-x | www/js/app.js | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index efdd5d28..3af2762b 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -162,6 +162,7 @@ angular.module('zmApp.controllers') 'videoPlaybackSpeed': 2, 'enableGIFMP4': false, 'enableStrictSSL': false, + 'enableSlowLoading': false, }; @@ -593,7 +594,8 @@ angular.module('zmApp.controllers') { //console.log ("************* AUGH"); - return $http({method:'GET', timeout:15000, url:urls[0].url}).then(function() + var hDelay = loginData.enableSlowLoading? zm.largeHttpTimeout:zm.httpTimeout; + return $http({method:'GET', timeout:hDelay, url:urls[0].url}).then(function() { log("Success: reachability on " + urls[0].url); $ionicLoading.hide(); @@ -1026,6 +1028,14 @@ angular.module('zmApp.controllers') } + if (typeof loginData.enableSlowLoading == 'undefined') + { + + loginData.enableSlowLoading = false; + + } + log ("SlowDelay is: "+loginData.enableSlowLoading); + if (typeof loginData.enableStrictSSL == 'undefined') { diff --git a/www/js/app.js b/www/js/app.js index 08bdfb7b..eca72814 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -55,6 +55,7 @@ angular.module('zmApp', [ //loginInterval: 30000, updateCheckInterval: 86400000, // 24 hrs loadingTimeout: 15000, + slowLoadingTimeout:60000, safeMontageLimit: 100, safeImageQuality: 10, maxFPS: 30, @@ -1103,12 +1104,13 @@ angular.module('zmApp', [ var loginData = NVRDataModel.getLogin(); console.log (">>>>>>>>>>>>>> PARALLEL POST WITH RECAPTCHA TO "+loginData.url); - + var hDelay = loginData.enableSlowLoading ? zm.largeHttpTimeout: zm.httpTimeout; //NVRDataModel.debug ("*** AUTH LOGIN URL IS " + loginData.url); $http( { + method: 'POST', - timeout:15000, + timeout:hDelay, //withCredentials: true, url: loginData.url + '/index.php', headers: |