diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-05 13:18:14 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-05 13:18:14 -0400 |
| commit | 53b07bd33b9cc3fcd30cc7a7d71a1c57d0a6960c (patch) | |
| tree | b54762e959227f969854a8ffcbc9032ecb48e613 /www/js/TimelineCtrl.js | |
| parent | 7708182b9fa22f30e076d14a9ce8637a1fa9fa23 (diff) | |
many other fixes for #234
Former-commit-id: 412018e40c05abe2bc299b13da9aeaa6d65b3eef
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 383a447d..ea608890 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -177,6 +177,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // pass this event to ModalCtrl $scope.currentEvent = event; + $scope.event = event; // in Timeline view, make sure events stick to same monitor $scope.followSameMonitor = "1"; @@ -620,6 +621,19 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } } } + + myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId); + // now construct base path + + myevents[i].Event.streamingURL = ZMDataModel.getStreamingURL (myevents[i].Event.MonitorId); + myevents[i].Event.baseURL = ZMDataModel.getBaseURL (myevents[i].Event.MonitorId); + myevents[i].Event.imageMode = ZMDataModel.getImageMode (myevents[i].Event.MonitorId); + // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL); + + // console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL); + + + if (idfound) { |