diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-18 17:02:03 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-18 17:02:03 -0400 |
| commit | 4720252ba5e1e981c8f78a3e57a36003b91ce82d (patch) | |
| tree | bcece4b38787442d846873dfab31df049fdba77b /www/js/EventCtrl.js | |
| parent | d4b661cd78db1b7cdc2b7174f8f254b4f5605a9c (diff) | |
#353 - more updates - need to check how it behaves with Montage Ctrl
Former-commit-id: 1e61637ba0bc6897b5c7d08c7a04c1243766f8d4
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 33e24f32..8254123c 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1774,7 +1774,11 @@ angular.module('zmApp.controllers') function humanizeTime(str) { //console.log ("Time:"+str+" TO LOCAL " + moment(str).local().toString()); + if (NVRDataModel.getLogin().useLocalTimeZone) return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow(); + else + return moment(str).fromNow(); + } $scope.prettifyDate = function (str) { |