summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2020-03-30 08:40:21 -0400
committerPliable Pixels <pliablepixels@gmail.com>2020-03-30 08:40:21 -0400
commit8a3882d6640553f6c1d42c0e65469e2ee1982d6d (patch)
treef90d3aaa2bcf87e9e9ee1c359d45d5e51f8e11aa /www/js/EventModalCtrl.js
parent02d71e2b9a146c72b6aea74f436e0f909ff74e23 (diff)
toggle option for animation frame in modal events
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js16
1 files changed, 13 insertions, 3 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 13e20ecb..e73779a6 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -2006,10 +2006,20 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
if (data.event.Event.Notes.indexOf('detected:') != -1) {
NVR.debug ("You have object detection! Adding object detect frame");
+ var frameid = 'objdetect';
+ var ld = NVR.getLogin();
+ if (!ld.showAnimation) {
+ if (NVR.versionCompare(ld.currentServerVersion, '1.35') != -1) {
+ frameid = 'objdetect_jpg';
+ }
+
+ }
+
$scope.alarm_images.unshift({
- frameid: 'objdetect',
- id: 'doesntseemtobeusedhuh'
- });
+ frameid: frameid,
+ id: 'whatever'
+ });
+
NVR.debug ("Your ZM version is:"+NVR.getCurrentServerVersion()+" and your obj frame setting is:"+NVR.getLogin().showObjectDetectionFrame);
} else {