From 8a3882d6640553f6c1d42c0e65469e2ee1982d6d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 30 Mar 2020 08:40:21 -0400
Subject: toggle option for  animation frame in modal events

---
 www/js/EventModalCtrl.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'www/js/EventModalCtrl.js')

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 {
-- 
cgit v1.2.3