diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-01 12:49:47 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-01 12:49:47 -0500 |
| commit | 1c853953689ffd5c1e3166b65e0ad89fb3db98f3 (patch) | |
| tree | 1a50cc3978a6d48bad23624a914959ca5a811710 /www/js/EventCtrl.js | |
| parent | f4dfcfd310df85b5bf3d1328d754ec4fcdbeb606 (diff) | |
device fixes for video type #60
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 7 |
1 files changed, 6 insertions, 1 deletions
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; |
