diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-01 11:02:34 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-01 11:02:34 -0400 |
| commit | d8953a069365e51000aa0e86e38bdd6bd251f2f4 (patch) | |
| tree | bc94c4e174e08d9462cdb99f5cd922e3fe948f8f /www/js/NVR.js | |
| parent | f13ae545e81fee9663a9a06177602efab5cfbdf0 (diff) | |
#933 add back spaces, 1.32 breaks. Make encoding optional in dev settings
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index 2ce30d9b..e6eadfd8 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.4.004"; + var zmAppVersion = "1.4.005"; var isBackground = false; var justResumed = false; @@ -222,6 +222,7 @@ angular.module('zmApp.controllers') 'obfuscationScheme': 'lzs', // or 'aes' 'showAnimation': true, 'montageHideFooter': false, + 'httpCordovaNoEncode': false, }; @@ -1639,6 +1640,11 @@ angular.module('zmApp.controllers') + if (typeof loginData.httpCordovaNoEncode == 'undefined') { + loginData.httpCordovaNoEncode = false; + } + + loginData.canSwipeMonitors = true; loginData.forceImageModePath = false; loginData.enableBlog = true; @@ -2825,7 +2831,7 @@ angular.module('zmApp.controllers') log((forceReload == 1) ? "getMonitors:Force reloading all monitors" : "getMonitors:Loading all monitors"); var apiurl = loginData.apiurl; var myurl = apiurl + "/monitors"; - myurl += "/index/"+"Type!=:WebSite.json" + "?"+$rootScope.authSession; + myurl += "/index/"+"Type !=:WebSite.json" + "?"+$rootScope.authSession; getZmsMultiPortSupport() .then(function (zmsPort) { @@ -3483,11 +3489,11 @@ angular.module('zmApp.controllers') if (monitorId != 0) myurl = myurl + "/"+"MonitorId:" + monitorId; if (startTime) - myurl = myurl + "/"+"StartTime<=:" + endTime; + myurl = myurl + "/"+"StartTime <=:" + endTime; if (endTime) - myurl = myurl + "/"+"EndTime>=:" + startTime; + myurl = myurl + "/"+"EndTime >=:" + startTime; - myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + myurl = myurl + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json if (loginData.objectDetectionFilter && !noObjectFilter) { @@ -3574,11 +3580,11 @@ angular.module('zmApp.controllers') if (monitorId != 0) myurl = myurl + "/"+"MonitorId:" + monitorId; if (startTime) - myurl = myurl + "/"+"StartTime<=:" + endTime; + myurl = myurl + "/"+"StartTime <=:" + endTime; if (endTime) - myurl = myurl + "/"+"EndTime>=:" + startTime; + myurl = myurl + "/"+"EndTime >=:" + startTime; - myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + myurl = myurl + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); //console.log ('********* MON FILTER '+monListFilter); if (monListFilter) |