diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-30 10:55:59 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-30 10:55:59 -0400 |
| commit | f286615882223adf7bc309c75a142286b5044cc1 (patch) | |
| tree | 5fa006dcdcde6a223543d5cad4102993741b00a0 /www/js/TimelineModalCtrl.js | |
| parent | dee2ad4192126f82a7afbe1974b4470b0d0218af (diff) | |
#618 add token for basic auth as "fyi" for all images
Diffstat (limited to 'www/js/TimelineModalCtrl.js')
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index e7a7e2cd..d442b47d 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -49,6 +49,25 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' } }; + + $scope.constructFrames = function (event,alarm) { + + var stream = ""; + if (event.Event.imageMode=='path') { + stream = event.Event.baseURL + "/index.php?view=image" + + "&path="+event.Event.relativePath+alarm.fname + + "&height=380"; + } + else if (event.Event.imageMode == 'fid') { + stream = event.Event.baseURL + "/index.php?view=image" + + "&fid="+alarm.id; + + } + if ($rootScope.authSession !='undefined') stream+=$rootScope.authSession; + if ($rootScope.basicAuthToken) stream +="&basicauth="+$rootScope.basicAuthToken; + return stream; + }; + //------------------------------------------------------- // we use this to reload the connkey if authkey changed //------------------------------------------------------ |
