diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 3 | ||||
| -rw-r--r-- | www/js/app.js | 2 |
3 files changed, 10 insertions, 2 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; diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 762ece16..75779aff 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -679,6 +679,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla if (idfound) { + + if (typeof myevents[i].Event.DefaultVideo === 'undefined') + myevents[i].Event.DefaultVideo=""; graphData.add({ id: graphIndex, content: "<span class='my-vis-font'>" + myevents[i].Event.Notes + "</span>", diff --git a/www/js/app.js b/www/js/app.js index 982a995e..45b5f56c 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -32,7 +32,7 @@ angular.module('zmApp', [ //----------------------------------------------- .constant('zm', { - minAppVersion: '1.28.105', // if ZM is less than this, the app won't work + minAppVersion: '1.28.107', // if ZM is less than this, the app won't work minEventServerVersion: '0.4', gcmSenderId:'710936220256', httpTimeout: 15000, |