diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-14 16:52:04 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-14 16:52:04 -0500 |
| commit | f579c186e8e70effae56509f1d6e7af1978be3d7 (patch) | |
| tree | 915337b4ccf463261239341ae26a07ecd8e1cbf2 /www/js/DataModel.js | |
| parent | eb47b69df4470fcfa5e7aeb76515a4cab4a406da (diff) | |
Various timezone related fixes, also was checking for alarm frames so 0 frame in-recording was never being closed. Still has bugs, need more testing #369
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index ad1aaff6..e6af8baa 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1493,6 +1493,9 @@ angular.module('zmApp.controllers') }, + getLocalTimeZoneNow: function() { + return moment.tz.guess(); + }, //returns TZ value immediately (sync) getTimeZoneNow: function() { @@ -1507,10 +1510,10 @@ angular.module('zmApp.controllers') return isTzSupported; }, - getTimeZone: function() { + getTimeZone: function(isForce) { var d = $q.defer(); - if (!tz) { + if (!tz || isForce) { log("First invocation of TimeZone, asking server"); var apiurl = loginData.apiurl + '/host/getTimeZone.json'; |
