summaryrefslogtreecommitdiff
path: root/www/js/MontageHistoryCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/MontageHistoryCtrl.js')
-rw-r--r--www/js/MontageHistoryCtrl.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 6a59f5d0..4b76ad96 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -960,10 +960,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
NVR.debug("Player is ready");
$timeout(function () {
m.Monitor.handle.pause();
- m.Monitor.handle.setPlayback(NVR.getLogin().videoPlaybackSpeed);
+
+ $timeout(function() {
+ m.Monitor.handle.setPlayback(NVR.getLogin().videoPlaybackSpeed);
m.Monitor.handle.play();
NVR.debug("*** Invoking play");
playerReady = true;
+ },300);
+
}, 300);
@@ -1371,7 +1375,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//console.log("Graphing on " + "eventchart-" + mid);
var cv = document.getElementById("eventchart-" + mid);
var ctx = cv.getContext("2d");
+ // ctx.height=30;
frameoptions = {
+ maintainAspectRatio: false,
responsive: true,
legend: false,
title: {