From 017d1416fa9148f84596aa109826cacb13c1c774 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 22 Oct 2016 13:07:39 -0400 Subject: #353 - more timezone tweaks, especially making sure humanizeTime is ALWAYS using local time irrespective of setting Former-commit-id: d28f076eb0a780a83466f259d17563b8d2d34a0d --- www/js/EventCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 66dec420..dfdbb779 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1776,10 +1776,10 @@ angular.module('zmApp.controllers') function humanizeTime(str) { //console.log ("Time:"+str+" TO LOCAL " + moment(str).local().toString()); - if (NVRDataModel.getLogin().useLocalTimeZone) + //if (NVRDataModel.getLogin().useLocalTimeZone) return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow(); - else - return moment(str).fromNow(); + // else + // return moment(str).fromNow(); } -- cgit v1.2.3