diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-22 13:07:39 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-22 13:07:39 -0400 |
| commit | 017d1416fa9148f84596aa109826cacb13c1c774 (patch) | |
| tree | 9a13dedffae454c835dcdc64e9d5e900a2c16445 /www/js/EventCtrl.js | |
| parent | 3e343e28c0120d5ebb540d3400eef86e6f1a7862 (diff) | |
#353 - more timezone tweaks, especially making sure humanizeTime is ALWAYS using local time irrespective of setting
Former-commit-id: d28f076eb0a780a83466f259d17563b8d2d34a0d
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 6 |
1 files changed, 3 insertions, 3 deletions
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(); } |