From 017d1416fa9148f84596aa109826cacb13c1c774 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
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/EventModalCtrl.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'www/js/EventModalCtrl.js')

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 37b41548..3674dab9 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1169,10 +1169,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     function humanizeTime(str)
     {
-         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