diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2013-04-01 14:18:51 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2013-04-01 14:18:51 -0400 |
| commit | adc4082e32f47f4f4f9b81819cea650dd752e690 (patch) | |
| tree | 2700361f076564adddf81a9e8724d71a4c7e63b3 /jquery-ui-timepicker-addon.js | |
| parent | 1905a8d8f70f8ba38d0105b971ab44ae01b9d1c7 (diff) | |
| download | jQuery-Timepicker-Addon-adc4082e32f47f4f4f9b81819cea650dd752e690.zip jQuery-Timepicker-Addon-adc4082e32f47f4f4f9b81819cea650dd752e690.tar.gz jQuery-Timepicker-Addon-adc4082e32f47f4f4f9b81819cea650dd752e690.tar.bz2 | |
Fixes #570 select generation to honor timeformat
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index fc6c8a6..97335f8 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -913,12 +913,13 @@ // select methods select: { create: function(tp_inst, obj, unit, val, min, max, step){ - var sel = '<select class="ui-timepicker-select" data-unit="'+ unit +'" data-min="'+ min +'" data-max="'+ max +'" data-step="'+ step +'">'; + var sel = '<select class="ui-timepicker-select" data-unit="'+ unit +'" data-min="'+ min +'" data-max="'+ max +'" data-step="'+ step +'">', + format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat; for(var i=min; i<=max; i+=step){ sel += '<option value="'+ i +'"'+ (i==val? ' selected':'') +'>'; - if(unit == 'hour' && useAmpm(tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat)){ - sel += $.datepicker.formatTime("hh TT", {hour:i}, tp_inst._defaults); + if(unit == 'hour'){ + sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig,'')), {hour:i}, tp_inst._defaults); } else if(unit == 'millisec' || i >= 10){ sel += i; } else {sel += '0'+ i.toString(); } |