diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-06-14 12:34:14 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-06-14 12:34:14 -0400 |
| commit | cc355ffd242506c1d25569069ae0634e6d38835d (patch) | |
| tree | ab42488f6046294679b0f989e2d1ff404401cddd | |
| parent | 00401f74098e2d37503fc038ee62480907112263 (diff) | |
#649 - update $scope.event when we move
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.006" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.007" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client 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 = ''; |