summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index ebc4bafc..6f5f53b2 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1730,17 +1730,23 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$scope.alarm_images = [];
tempAlarms = [];
$scope.FrameArray = data.event.Frame;
+ var ts = 0;
for (i = 0; i < data.event.Frame.length; i++) {
if (data.event.Frame[i].Type == "Alarm") {
// console.log ("**ONLY ALARM AT " + i + "of " + data.event.Frame.length);
- tempAlarms.push({
+ if (ts != data.event.Frame[i].TimeStamp)
+ {
+ tempAlarms.push({
- id: data.event.Frame[i].Id,
- frameid: data.event.Frame[i].FrameId,
- });
+ id: data.event.Frame[i].Id,
+ frameid: data.event.Frame[i].FrameId,
+ });
+ ts = data.event.Frame[i].TimeStamp;
+ }
+
}