diff --git a/app/assets/javascripts/events.js.coffee b/app/assets/javascripts/events.js.coffee index 7d3352e..c02a372 100644 --- a/app/assets/javascripts/events.js.coffee +++ b/app/assets/javascripts/events.js.coffee @@ -13,7 +13,7 @@ $ -> setTimeout (() -> $('#updating_event_list').hide()), 2500 setPickers = ()-> - $('.timepicker').timepicker({ 'step': 15, 'showDuration': true, 'timeFormat': 'g:ia', 'scrollDefaultNow': true }) + $('.timepicker').timepicker({ 'step': 15, 'showDuration': true, 'timeFormat': 'G:i', 'scrollDefaultNow': true }) $('.datepicker').datepicker({ 'autoclose': true, 'dateFormat': 'd/m/yy', 'format': 'dd/mm/yyyy' }) runPermanentHooks = ()-> diff --git a/app/assets/javascripts/stashes.js.coffee b/app/assets/javascripts/stashes.js.coffee index e590875..fcd363a 100644 --- a/app/assets/javascripts/stashes.js.coffee +++ b/app/assets/javascripts/stashes.js.coffee @@ -2,7 +2,7 @@ # All this logic will automatically be available in application.js. # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ $ -> - $('.timepicker').timepicker({ 'step': 15, 'showDuration': true, 'timeFormat': 'g:ia', 'scrollDefaultNow': true }) + $('.timepicker').timepicker({ 'step': 15, 'showDuration': true, 'timeFormat': 'G:i', 'scrollDefaultNow': true }) $('.datepicker').datepicker({ 'autoclose': true, 'dateFormat': 'd/m/yy', 'format': 'dd/mm/yyyy' }) $('.create-custom-stash-working').hide() $('.show-custom-stash-modal').click -> diff --git a/lib/assets/javascripts/datepair.js b/lib/assets/javascripts/datepair.js index 218e7a9..8f87773 100644 --- a/lib/assets/javascripts/datepair.js +++ b/lib/assets/javascripts/datepair.js @@ -12,7 +12,7 @@ $(function() { $('input.time_input').each(function() { var $this = $(this); - var opts = { 'step': 15, 'showDuration': true, 'timeFormat': 'g:ia', 'scrollDefaultNow': true }; + var opts = { 'step': 15, 'showDuration': true, 'timeFormat': 'G:i', 'scrollDefaultNow': true }; if ($this.hasClass('start') || $this.hasClass('end')) { opts.onSelect = doDatepair;