diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-12-07 10:56:45 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-12-07 10:56:45 -0500 |
| commit | d36f0a793cef63c5ce239729fd31f83956407193 (patch) | |
| tree | 1ccbe68783430511b81434107d204e397d7e20a2 /www | |
| parent | b2b3c1a70e61d41255d70ad405293e5ed2b851f6 (diff) | |
tid bits
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/DataModel.js | 5 | ||||
| -rw-r--r-- | www/js/FirstUseCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 704a4f05..86efb329 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.033"; + var zmAppVersion = "1.3.035"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; @@ -211,6 +211,9 @@ angular.module('zmApp.controllers') */ function setCordovaHttpOptions() { + debug ("Cordova HTTP: disabling redirect till bug in library is fixed"); + cordova.plugin.http.disableRedirect(true, + function(s) {debug ("redirect disabled");}, function (e) {debug ("redirect disable FAILED");}); if (loginData.isUseBasicAuth) { debug("Cordova HTTP: configuring basic auth"); cordova.plugin.http.useBasicAuth(loginData.basicAuthUser, loginData.basicAuthPassword); diff --git a/www/js/FirstUseCtrl.js b/www/js/FirstUseCtrl.js index 551a2bb3..14cd09a0 100644 --- a/www/js/FirstUseCtrl.js +++ b/www/js/FirstUseCtrl.js @@ -25,7 +25,7 @@ angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope', }); if ($rootScope.platformOS == 'android') { - log (">>> Android: enabling inline image view for self signed certs"); + NVRDataModel.log (">>> Android: enabling inline image view for self signed certs"); cordova.plugins.certificates.trustUnsecureCerts(true); } diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index c52022f6..8a1927b3 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -298,6 +298,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc //console.log ("ldurl is " + ld.streamingurl); var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality; + $scope.MontageMonitors[j].Monitor.eventUrl = $scope.MontageMonitors[j].Monitor.streamingURL + "/nph-zms?source=event&mode=jpeg&event=" + eid + "&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[j].Monitor.connKey + "&scale=" + bw + $rootScope.authSession; //console.log ("Setting event URL to " +$scope.MontageMonitors[j].Monitor.eventUrl); // console.log ("SWITCHING TO " + $scope.MontageMonitors[j].eventUrl); |