diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-01-27 08:44:39 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-01-27 08:44:39 -0500 |
| commit | ca03105f8473f911732e04a20daccb609929d976 (patch) | |
| tree | d62540526dd3ffff364832515b1e4baef9401ee2 /www/js/MontageHistoryCtrl.js | |
| parent | 8e76c15b8e83d04526e5b913d413224f5dd5db97 (diff) | |
#155 more tweaks
Former-commit-id: aca2e26558a75cc2071971f5c83f0b32eab054de
Diffstat (limited to 'www/js/MontageHistoryCtrl.js')
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 9d2d4857..ee13f06c 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -88,6 +88,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc $http.get(apiurl) .success( function(data) { + + ZMDataModel.zmDebug ("Got new history events:"+ JSON.stringify(data)); var eid, mid; for (i=0; i<data.events.length; i++) @@ -101,9 +103,17 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc // that's the earliest match and play gapless from there if ($scope.MontageMonitors[j].Monitor.Id == mid) { - if ($scope.MontageMonitors[j].eventUrl == 'img/noevent.png') - $scope.MontageMonitors[j].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+eid+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single"); - + if ($scope.MontageMonitors[j].eventUrl == 'img/noevent.png') + + if (!ZMDataModel.isBackground()) + { + $scope.MontageMonitors[j].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+eid+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single"); + } + else + { + ZMDataModel.zmLog ("Setting img src to null as we are in background"); + $scope.MontageMonitors[j].eventUrl=""; + } } } } @@ -148,9 +158,19 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc // console.log ("EXPANDED DATA FOR MONITOR " + i + JSON.stringify(data)); if (data.events.length > 0 ) { - $scope.MontageMonitors[i].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.events[0].Event.Id+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single"); - ZMDataModel.zmLog ("Found expanded event "+data.events[0].Event.Id+" for monitor " + $scope.MontageMonitors[i].Monitor.Id); + if (!ZMDataModel.isBackground()) + { + + $scope.MontageMonitors[i].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.events[0].Event.Id+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single"); + + ZMDataModel.zmLog ("Found expanded event "+data.events[0].Event.Id+" for monitor " + $scope.MontageMonitors[i].Monitor.Id); + } + else + { + $scope.MontageMonitors[i].eventUrl=""; + ZMDataModel.zmLog ("Setting img src to null as data received in background"); + } } }) |