Skip to content

Commit adc4082

Browse files
Fixes trentrichardson#570 select generation to honor timeformat
1 parent 1905a8d commit adc4082

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

jquery-ui-timepicker-addon.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -913,12 +913,13 @@
913913
// select methods
914914
select: {
915915
create: function(tp_inst, obj, unit, val, min, max, step){
916-
var sel = '<select class="ui-timepicker-select" data-unit="'+ unit +'" data-min="'+ min +'" data-max="'+ max +'" data-step="'+ step +'">';
916+
var sel = '<select class="ui-timepicker-select" data-unit="'+ unit +'" data-min="'+ min +'" data-max="'+ max +'" data-step="'+ step +'">',
917+
format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
917918

918919
for(var i=min; i<=max; i+=step){
919920
sel += '<option value="'+ i +'"'+ (i==val? ' selected':'') +'>';
920-
if(unit == 'hour' && useAmpm(tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat)){
921-
sel += $.datepicker.formatTime("hh TT", {hour:i}, tp_inst._defaults);
921+
if(unit == 'hour'){
922+
sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig,'')), {hour:i}, tp_inst._defaults);
922923
}
923924
else if(unit == 'millisec' || i >= 10){ sel += i; }
924925
else {sel += '0'+ i.toString(); }

0 commit comments

Comments
 (0)