diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-09-06 08:01:48 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-09-06 08:01:48 -0400 |
| commit | 1bd8fd4419bb43519b0194d7504f69166b1b4917 (patch) | |
| tree | ca8f41fb330cb0146c8229fefc6df6defa3e1e3c /www/js/EventCtrl.js | |
| parent | 99154f9d7ed03e8f818c56055591cdb3774f669d (diff) | |
don't add alarm frames if 0
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index b37b5f92..1fdac94a 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1860,7 +1860,9 @@ angular.module('zmApp.controllers') //https://server/zm/api/events/consoleEvents/5%20minute.json var ld = NVR.getLogin(); - var af = "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); + var af=""; + if (ld.enableAlarmCount && ld.minAlarmCount ) + af = "/AlarmFrames >=:" + ld.minAlarmCount ; if (ld.objectDetectionFilter) { af = af + '/'+'Notes REGEXP:detected:'; @@ -2981,7 +2983,7 @@ angular.module('zmApp.controllers') if ($rootScope.devWidth > $rootScope.devHeight) { if (ld.eventViewThumbsSize == 'large') { - return calculateAspectRatioFit(mw, mh, 0.9* $rootScope.devWidth, 1.5 * $rootScope.devHeight); + return calculateAspectRatioFit(mw, mh, 0.8* $rootScope.devWidth, 1.5 * $rootScope.devHeight); } else { return calculateAspectRatioFit(mw, mh, 0.5 * $rootScope.devWidth, 0.7 * $rootScope.devHeight); |