|
28 | 28 | minute: 0,
|
29 | 29 | second: 0,
|
30 | 30 | ampm: '',
|
| 31 | + altFormattedDate: '', |
31 | 32 | formattedDate: '',
|
32 | 33 | formattedTime: '',
|
33 | 34 | formattedDateTime: '',
|
|
48 | 49 | minute: 0,
|
49 | 50 | second: 0,
|
50 | 51 | timeFormat: 'hh:mm tt',
|
51 |
| - alwaysSetTime: true |
| 52 | + alwaysSetTime: true, |
52 | 53 | //----------------------------
|
| 54 | + locale: { |
| 55 | + time: 'Time', |
| 56 | + hour: 'Hour', |
| 57 | + minute: 'Minute', |
| 58 | + second: 'Second', |
| 59 | + chooseTime: 'Choose time' |
| 60 | + } |
53 | 61 | },
|
54 | 62 |
|
55 | 63 | //########################################################################
|
|
142 | 150 | if ($dp.find("div#ui-timepicker-div").length == 0) {
|
143 | 151 | var html = '<div id="ui-timepicker-div">' +
|
144 | 152 | '<dl>' +
|
145 |
| - '<dt id="ui_tpicker_time_label"' + ((tp_inst.defaults.showTime) ? '' : ' style="display:none;"') + '>Time</dt>' + |
| 153 | + '<dt id="ui_tpicker_time_label"' + ((tp_inst.defaults.showTime) ? '' : ' style="display:none;"') + '>' + tp_inst.defaults.locale.time + '</dt>' + |
146 | 154 | '<dd id="ui_tpicker_time"' + ((tp_inst.defaults.showTime) ? '' : ' style="display:none;"') + '></dd>' +
|
147 |
| - '<dt id="ui_tpicker_hour_label"' + ((tp_inst.defaults.showHour) ? '' : ' style="display:none;"') + '>Hour</dt>' + |
| 155 | + '<dt id="ui_tpicker_hour_label"' + ((tp_inst.defaults.showHour) ? '' : ' style="display:none;"') + '>' + tp_inst.defaults.locale.hour + '</dt>' + |
148 | 156 | '<dd id="ui_tpicker_hour"' + ((tp_inst.defaults.showHour) ? '' : ' style="display:none;"') + '></dd>' +
|
149 |
| - '<dt id="ui_tpicker_minute_label"' + ((tp_inst.defaults.showMinute) ? '' : ' style="display:none;"') + '>Minute</dt>' + |
| 157 | + '<dt id="ui_tpicker_minute_label"' + ((tp_inst.defaults.showMinute) ? '' : ' style="display:none;"') + '>' + tp_inst.defaults.locale.minute + '</dt>' + |
150 | 158 | '<dd id="ui_tpicker_minute"' + ((tp_inst.defaults.showMinute) ? '' : ' style="display:none;"') + '></dd>' +
|
151 |
| - '<dt id="ui_tpicker_second_label"' + ((tp_inst.defaults.showSecond) ? '' : ' style="display:none;"') + '>Second</dt>' + |
| 159 | + '<dt id="ui_tpicker_second_label"' + ((tp_inst.defaults.showSecond) ? '' : ' style="display:none;"') + '>' + tp_inst.defaults.locale.second + '</dt>' + |
152 | 160 | '<dd id="ui_tpicker_second"' + ((tp_inst.defaults.showSecond) ? '' : ' style="display:none;"') + '></dd>' +
|
153 | 161 | '</dl>' +
|
154 | 162 | '</div>';
|
155 | 163 |
|
156 | 164 | $tp = $(html);
|
157 | 165 |
|
158 | 166 | if (tp_inst.defaults.timeOnly == true) { // if we only want time picker
|
159 |
| - $tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all"><div class="ui-datepicker-title">Choose Time</div></div>'); |
| 167 | + $tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all"><div class="ui-datepicker-title">' + tp_inst.defaults.locale.chooseTime + '</div></div>'); |
160 | 168 | $dp.find('.ui-datepicker-header, .ui-datepicker-calendar, .ui-datepicker-current').hide();
|
161 | 169 | }
|
162 | 170 |
|
|
265 | 273 | updateDateTime: function(dp_inst, tp_inst) {
|
266 | 274 | var dt = this.$input.datepicker('getDate');
|
267 | 275 |
|
268 |
| - if (dt == null) |
| 276 | + if (dt == null) { |
269 | 277 | this.formattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'dateFormat'), new Date(), $.datepicker._getFormatConfig(dp_inst));
|
270 |
| - else this.formattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'dateFormat'), dt, $.datepicker._getFormatConfig(dp_inst)); |
| 278 | + if (this.$input.datepicker('option', 'altField')) { |
| 279 | + this.altFormattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'altFormat'), new Date(), $.datepicker._getFormatConfig(dp_inst)); |
| 280 | + } |
| 281 | + } else { |
| 282 | + this.formattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'dateFormat'), dt, $.datepicker._getFormatConfig(dp_inst)); |
| 283 | + // Added to handle datepicker's alt format, if present |
| 284 | + if (this.$input.datepicker('option', 'altField')) { |
| 285 | + this.altFormattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'altFormat'), dt, $.datepicker._getFormatConfig(dp_inst)); |
| 286 | + } |
| 287 | + } |
271 | 288 |
|
272 | 289 | if (this.defaults.alwaysSetTime) {
|
273 | 290 | this.formattedDateTime = this.formattedDate + ' ' + this.formattedTime;
|
274 |
| - } |
275 |
| - else { |
| 291 | + } else { |
276 | 292 | if (dt == null || !tp_inst.timeDefined || tp_inst.timeDefined == false) {
|
277 | 293 | this.formattedDateTime = this.formattedDate;
|
278 | 294 | }
|
|
281 | 297 | }
|
282 | 298 | }
|
283 | 299 | //-----------------------------
|
284 |
| - |
285 |
| - if (this.defaults.timeOnly == true) |
| 300 | + // Added to handle datepicker's alt field, if present |
| 301 | + if (this.$input.datepicker('option', 'altField')) { |
| 302 | + if (this.defaults.timeOnly == true) { |
| 303 | + $(this.$input.datepicker('option', 'altField')).val(this.formattedTime); |
| 304 | + } else { |
| 305 | + $(this.$input.datepicker('option', 'altField')).val(this.altFormattedDate+' '+this.formattedTime); |
| 306 | + } |
| 307 | + } |
| 308 | + |
| 309 | + if (this.defaults.timeOnly == true) { |
286 | 310 | this.$input.val(this.formattedTime);
|
287 |
| - else this.$input.val(this.formattedDateTime); |
| 311 | + } else { |
| 312 | + this.$input.val(this.formattedDateTime); |
| 313 | + } |
288 | 314 | }
|
289 | 315 | };
|
290 | 316 |
|
|
0 commit comments