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/TimelineCtrl.js | |
| parent | 0786d0b87dc358be3919891bbb3c3b69b3978b37 (diff) | |
#175 - new option to enable/disable 24hr clock in Dev settings
Former-commit-id: 86fbef04eb4f75e4c4441fa7f57821cfe4d9bfe1
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 8f0a8057..30bb6089 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -49,7 +49,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // Used to display date range for timeline //----------------------------------------------------------- $scope.prettify = function (str) { - return moment(str).format('MMMM Do YYYY, h:mm:ssa'); + return moment(str).format('MMMM Do YYYY, '+ZMDataModel.getTimeFormat()); }; //----------------------------------------------------------- @@ -475,12 +475,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla stack: false, format: { minorLabels: { - minute: "hh:mm a", - hour: 'hh:mm a', + minute: ZMDataModel.getTimeFormat(), + hour: ZMDataModel.getTimeFormat(), second: 's', }, majorLabels: { - second: "D MMM hh:mm a", + second: "D MMM "+ZMDataModel.getTimeFormat(), } }, |