diff options
Diffstat (limited to 'www')
| -rwxr-xr-x | www/js/DataModel.js | 12 | ||||
| -rwxr-xr-x | www/js/app.js | 6 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 1 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 6 |
4 files changed, 22 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: diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 1927aeef..ffe77315 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -77,6 +77,7 @@ "kEnableLogs" :"Enable logs", "kEnableNewsUpdates" :"enable news updates", "kEnterPin" :"Enter PIN", + "kEnableSlowLoading" :"Use large HTTP timeouts", "kEnableStrictSSL" : "Enable strict SSL check", "kError" :"Error", "kErrorChangingMonitors" :"Error changing monitors. Please check logs", diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index e72ffe72..bc950d81 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -129,6 +129,12 @@ </label> <label> + <ion-toggle ng-model="loginData.enableSlowLoading" ng-checked="loginData.enableSlowLoading" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableSlowLoading' | translate}} + </span> + </ion-toggle> + </label> + + <label> <ion-toggle ng-model="loginData.disableAlarmCheckMontage" ng-checked="loginData.disableAlarmCheckMontage" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableAlarmMontage' | translate}} <p>{{'kDisableAlarmMontageSub' | translate}}</p></span> </ion-toggle> |