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/EventCtrl.js | |
| parent | 0786d0b87dc358be3919891bbb3c3b69b3978b37 (diff) | |
#175 - new option to enable/disable 24hr clock in Dev settings
Former-commit-id: 86fbef04eb4f75e4c4441fa7f57821cfe4d9bfe1
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index c46a830b..2b3829d8 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -393,8 +393,8 @@ angular.module('zmApp.controllers') $scope.filterTapped = function () { //console.log("FILTER TAPPED"); - var myFrom = moment($rootScope.fromString).format("MMM/DD/YYYY hh:mm a").toString(); - var toString = moment($rootScope.toString).format("MMM/DD/YYYY hh:mm a").toString(); + var myFrom = moment($rootScope.fromString).format("MMM/DD/YYYY "+ZMDataModel.getTimeFormat()).toString(); + var toString = moment($rootScope.toString).format("MMM/DD/YYYY "+ZMDataModel.getTimeFormat()).toString(); $rootScope.zmPopup = $ionicPopup.confirm({ title: 'Filter settings', @@ -1484,12 +1484,12 @@ angular.module('zmApp.controllers') } $scope.prettifyTime = function (str) { - return moment(str).format('h:mm:ssa'); + return moment(str).format(ZMDataModel.getTimeFormat()); }; $scope.prettify = function (str) { - return moment(str).format('h:mm:ssa on MMMM Do YYYY'); + return moment(str).format(ZMDataModel.getTimeFormat()+' on MMMM Do YYYY'); }; //-------------------------------------------------------- // For consistency we are keeping the refresher list |