diff options
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index 77fd91ab..36ddf880 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.3.083"; + var zmAppVersion = "1.3.085"; var zmAPIVersion = null; var isBackground = false; var justResumed = false; @@ -209,6 +209,7 @@ angular.module('zmApp.controllers') 'kioskPassword': '', 'useAPICaching': true, 'pauseStreams': false, + 'liveStreamBuffer': 100, }; @@ -1597,9 +1598,14 @@ angular.module('zmApp.controllers') } + if (typeof loginData.liveStreamBuffer == 'undefined') { + loginData.liveStreamBuffer = 100; + } + loginData.canSwipeMonitors = true; loginData.forceImageModePath = false; loginData.enableBlog = true; + loginData.pauseStreams = false; } @@ -2772,7 +2778,8 @@ angular.module('zmApp.controllers') for (var i = 0; i < monitors.length; i++) { - // make them all show for now + // zm 1.33.15 prefixes 'ROTATE_' to orientation + monitors[i].Monitor.Orientation = monitors[i].Monitor.Orientation.replace('ROTATE_',''); var recordingType = ''; if (monitors[i].Monitor.SaveJPEGs > 0) { @@ -2954,6 +2961,8 @@ angular.module('zmApp.controllers') for (var i = 0; i < monitors.length; i++) { //monitors[i].Monitor.listDisplay = 'show'; + // zm 1.33.15 prefixes 'ROTATE_' to orientation + monitors[i].Monitor.Orientation = monitors[i].Monitor.Orientation.replace('ROTATE_',''); monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); monitors[i].Monitor.rndKey = (Math.floor((Math.random() * 999999) + 1)).toString(); |