diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-06 10:31:10 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-06 10:31:10 -0500 |
| commit | 856e977356f0a70839f323deef44671fb3f6f533 (patch) | |
| tree | 42417941a0d77158f34e81c6999920928b0edb36 /www/js/DataModel.js | |
| parent | 0786d0b87dc358be3919891bbb3c3b69b3978b37 (diff) | |
#175 - new option to enable/disable 24hr clock in Dev settings
Former-commit-id: 86fbef04eb4f75e4c4441fa7f57821cfe4d9bfe1
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 1b6b5c81..814c87ff 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -70,6 +70,7 @@ angular.module('zmApp.controllers') 'forceNetworkStop':false, 'defaultPushSound': false, 'enableBlog':true, + 'use24hr':false, }; @@ -284,6 +285,13 @@ angular.module('zmApp.controllers') } + if (typeof loginData.use24hr == 'undefined') + { + zmDebug ("use24hr does not exist. Setting to false"); + loginData.use24hr = false; + + } + if (typeof loginData.montageHistoryQuality == 'undefined') { zmDebug ("montageHistoryQuality does not exist. Setting to 50"); @@ -395,7 +403,10 @@ angular.module('zmApp.controllers') }, - + getTimeFormat: function() + { + return (loginData.use24hr ? "HH:mm": "hh:mm a"); + }, //------------------------------------------------------------------ // switches screen to 'always on' or 'auto' |