From 4720252ba5e1e981c8f78a3e57a36003b91ce82d Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 18 Oct 2016 17:02:03 -0400 Subject: #353 - more updates - need to check how it behaves with Montage Ctrl Former-commit-id: 1e61637ba0bc6897b5c7d08c7a04c1243766f8d4 --- www/js/EventCtrl.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'www/js/EventCtrl.js') 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) { -- cgit v1.2.3