diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventCtrl.js | 8 | ||||
| -rw-r--r-- | www/js/MomentCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 71c973fb..967c80d0 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -509,6 +509,8 @@ angular.module('zmApp.controllers') var mw = parseInt(tempMon.Monitor.Width); var mh = parseInt(tempMon.Monitor.Height); + + var mo = parseInt(tempMon.Monitor.Orientation); myevents[i].Event.Rotation = ''; @@ -2854,8 +2856,6 @@ angular.module('zmApp.controllers') var tempMon = NVR.getMonitorObject(myevents[i].Event.MonitorId); if (tempMon != undefined) { - - var mw = parseInt(tempMon.Monitor.Width); var mh = parseInt(tempMon.Monitor.Height); var mo = parseInt(tempMon.Monitor.Orientation); @@ -2926,6 +2926,8 @@ angular.module('zmApp.controllers') function computeThumbnailSize(mw, mh, mo) { + + tw = Math.min(Math.round(0.35 * $rootScope.devWidth), 200); th = 150; @@ -2935,7 +2937,7 @@ angular.module('zmApp.controllers') h: 0 }; - + /* seems I really should be using strings due to horz and very but luckily parseInt will make them 0 which gets treated as "nothing to do" '0' => translate('Normal'), diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index c53974a3..915722dd 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -212,6 +212,8 @@ var masonry = null; for (var i = 0; i < monitors.length; i++) { if (mid == monitors[i].Monitor.Id) { + + return { width: monitors[i].Monitor.Width, height: monitors[i].Monitor.Height, diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index a14180d4..5f3f0c4d 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1286,16 +1286,17 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ stream = $scope.monitor.Monitor.streamingURL + "/nph-zms?mode=" + getSingleStreamMode() + "&monitor=" + $scope.monitorId + - "&scale=" + scale + - '&buffer=1000'; + "&scale=" + scale; if (fps) { stream +='&maxfps='+fps; } stream += $rootScope.authSession + - "&rand=" + $rootScope.modalRand + appendSingleStreamConnKey(); + if (currentStreamState != streamState.SNAPSHOT_LOWQUALITY) + stream += "&rand=" + $rootScope.modalRand + "&buffer=1000"; + //console.log ("STREAM="+stream); if (stream) stream += NVR.insertBasicAuthToken(); |
