summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-06-14 12:34:14 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-06-14 12:34:14 -0400
commitcc355ffd242506c1d25569069ae0634e6d38835d (patch)
treeab42488f6046294679b0f989e2d1ff404401cddd /www/js
parent00401f74098e2d37503fc038ee62480907112263 (diff)
#649 - update $scope.event when we move
Diffstat (limited to 'www/js')
-rw-r--r--www/js/EventModalCtrl.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 6f5f53b2..8ad4b81d 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1101,6 +1101,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$scope.videoTime = function (s, c) {
+
+ // console.log ("VIDEO TIME WITH "+s+ " and "+c);
var a, o;
if (NVRDataModel.getLogin().useLocalTimeZone) {
a = moment.tz(s, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess());
@@ -1795,11 +1797,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$http.get(myurl)
.then(function (success) {
- // console.log ("DUCCESS::"+JSON.stringify(success));
-
-
var event = success.data.event;
currentEvent = event;
+ $scope.event = event;
+
computeAlarmFrames(success.data);
$scope.eventWarning = '';