add object detect frame in zmNinja too

2 files changed, 15 insertions, 1 deletions

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 5dde11a4..72214748 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1876,6 +1876,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     tempAlarms = [];
     $scope.FrameArray = [];
 
+
     //console.log ("FRAME ARRAY: "+JSON.stringify(data));
     if (data.event && data.event.Frame) $scope.FrameArray = data.event.Frame;
     var ts = 0;
@@ -1901,6 +1902,19 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     if (tempAlarms.length > 1) // don't do it for just one too
       $scope.alarm_images = tempAlarms;
 
+    if (data.event.Event.Notes.indexOf('detected:') != -1) {
+          
+            NVR.debug ("You have object detection! Adding object detect frame");
+            $scope.alarm_images.unshift({
+                frameid: 'objdetect',
+                id: 'doesntseemtobeusedhuh'
+            });
+            NVR.debug ("Your ZM version is:"+NVR.getCurrentServerVersion()+" and your obj frame setting is:"+NVR.getLogin().showObjectDetectionFrame);
+
+    } else {
+      NVR.debug ("No object detection found in notes");
+    }
+
   }
 
   $scope.constructFrame = function (fid) {
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 81a22376..87794ba9 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1778,7 +1778,7 @@ angular.module('zmApp.controllers')
 
       var stream;
       if (currentStreamState == streamState.STOPPED || monitor.Monitor.listDisplay == 'noshow' || $rootScope.authSession == 'undefined') {
-        // console.log ("STREAM=empty and auth="+$rootScope.authSession);
+        //console.log ("STREAM=empty and auth="+$rootScope.authSession);
         return "";
       }