diff options
| -rw-r--r-- | www/js/DataModel.js | 9 | ||||
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index ae201667..ba74039f 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -27,6 +27,7 @@ angular.module('zmApp.controllers') var migrationComplete = false; var tz = ""; + var isTzSupported = false; var languages = [ @@ -1485,11 +1486,17 @@ angular.module('zmApp.controllers') // returns server timezone, failing which local timezone // always resolves true + isTzSupported: function() + { + return isTzSupported; + }, + getTimeZone: function () { var d = $q.defer(); if (!tz) { + log ("First invocation of TimeZone, asking server"); var apiurl = loginData.apiurl + '/host/getTimeZone.json'; $http.get(apiurl) @@ -1497,6 +1504,7 @@ angular.module('zmApp.controllers') tz = success.data.tz; d.resolve(tz); debug ("Timezone API response is:"+success.data.tz); + isTzSupported = true; return (d.promise); }, @@ -1504,6 +1512,7 @@ angular.module('zmApp.controllers') tz = moment.tz.guess(); debug("Timezone API error handler, guessing local:" + tz); d.resolve(tz); + isTzSupported = false; return (d.promise); }); diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 56924ddf..2fc9115b 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -27,6 +27,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' }, { reload: true }); + return; } }; @@ -54,6 +55,11 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' NVRDataModel.setAwake(false); }); + + $scope.isTzSupported = function() + { + return NVRDataModel.isTzSupported(); + }; //------------------------------------------------------------------ // Perform the login action when the user submits the login form |