From 1c853953689ffd5c1e3166b65e0ad89fb3db98f3 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Sun, 1 Nov 2015 12:49:47 -0500 Subject: device fixes for video type #60 --- www/js/EventCtrl.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index a7cefade..001e98ea 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -698,7 +698,8 @@ angular.module('zmApp.controllers') // now get event details to show alarm frames var loginData = ZMDataModel.getLogin(); - + if (typeof event.Event.DefaultVideo === 'undefined') + event.Event.DefaultVideo=""; // grab video details event.Event.video = {}; var videoURL = loginData.url + "/events/" + event.Event.relativePath + event.Event.DefaultVideo; @@ -1122,8 +1123,12 @@ angular.module('zmApp.controllers') $scope.eFramesNum = eframes; $scope.eventDur = Math.round(edur); $scope.loginData = ZMDataModel.getLogin(); + if (typeof event.Event.DefaultVideo === 'undefined') + event.Event.DefaultVideo=""; + $scope.defaultVideo = event.Event.DefaultVideo; + event.Event.video = {}; var videoURL = $scope.loginData.url + "/events/" + event.Event.relativePath + event.Event.DefaultVideo; -- cgit v1.2.3