From e0a2f98b0a8f9b861a1d97696aa24e38fa24457e Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Fri, 6 May 2016 20:28:52 -0400 Subject: #241 - fix direct image url in timeline Former-commit-id: cc32fd77b0dd2280c9a6b75fe9b15e8199323379 --- www/js/TimelineCtrl.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'www/js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index ea608890..241c1170 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -628,6 +628,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla 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); + if (ZMDataModel.getLogin().url != myevents[i].Event.baseURL) + { + //ZMDataModel.zmDebug ("Multi server, changing base"); + myevents[i].Event.baseURL = ZMDataModel.getLogin().url; + + } // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL); // console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL); -- cgit v1.2.3