summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-05-25 11:17:57 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-05-25 11:17:57 -0400
commitb228aee0a20f4bb6d261df7e98b53da0effeb9cf (patch)
tree47be45ff0d5fc6d7fea6a1003f5095142c38a469
parent6b9e4e46055670086e16893b58cebdddf45e1f02 (diff)
correct outline motion handling
-rw-r--r--www/js/EventCtrl.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 11db7d2a..dbf255b6 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -59,7 +59,7 @@ angular.module('zmApp.controllers')
$scope.typeOfFrames = $translate.instant('kShowTimeDiffFrames');
$scope.outlineMotion = false;
- $scope.outlineMotionParam = "";
+ $scope.outlineMotionParam = "&show=capture";
var eventsListScrubHeight = eventsListScrubHeight;
@@ -1006,7 +1006,7 @@ angular.module('zmApp.controllers')
if ($scope.outlineMotion)
$scope.outlineMotionParam = "&show=analyse";
else
- $scope.outlineMotionParam = "";
+ $scope.outlineMotionParam = "&show=capture";
};
$scope.toggleTypeOfAlarms = function () {
@@ -2827,7 +2827,7 @@ angular.module('zmApp.controllers')
$scope.constructThumbnail = function (event) {
var stream = "";
stream = event.Event.baseURL +
- "/index.php?view=image&fid=" +
+ "/index.php?view=image&show=capture&fid=" +
(event.Event.MaxScoreFrameId ? event.Event.MaxScoreFrameId : "1&eid=" + event.Event.Id) +
"&width=" + event.Event.thumbWidth * 2 +
"&height=" + event.Event.thumbHeight * 2;
@@ -2847,7 +2847,7 @@ angular.module('zmApp.controllers')
} else if (event.Event.imageMode == 'fid') {
stream = event.Event.baseURL + "/index.php?view=image" +
- "&fid=" + slide.id;
+ "&fid=" + slide.id + $scope.outlineMotionParam;
}
if ($rootScope.authSession != 'undefined') stream += $rootScope.authSession;