|
914 | 914 | } else if (this.$altInput) { |
915 | 915 | this.$input.val(formattedDateTime); |
916 | 916 | var altFormattedDateTime = '', |
917 | | - altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator, |
918 | | - altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix; |
| 917 | + altSeparator = this._defaults.altSeparator !== null ? this._defaults.altSeparator : this._defaults.separator, |
| 918 | + altTimeSuffix = this._defaults.altTimeSuffix !== null ? this._defaults.altTimeSuffix : this._defaults.timeSuffix; |
919 | 919 |
|
920 | 920 | if (!this._defaults.timeOnly) { |
921 | 921 | if (this._defaults.altFormat) { |
|
930 | 930 | } |
931 | 931 | } |
932 | 932 |
|
933 | | - if (this._defaults.altTimeFormat) { |
| 933 | + if (this._defaults.altTimeFormat !== null) { |
934 | 934 | altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix; |
935 | 935 | } |
936 | 936 | else { |
|
1484 | 1484 | altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime; |
1485 | 1485 | } |
1486 | 1486 | } |
1487 | | - $(altField).val(altFormattedDateTime); |
| 1487 | + $(altField).val( inst.input.val() ? altFormattedDateTime : ""); |
1488 | 1488 | } |
1489 | 1489 | } |
1490 | 1490 | else { |
1491 | | - $.datepicker._base_updateAlternate(inst); |
| 1491 | + $.datepicker._base_updateAlternate(inst); |
1492 | 1492 | } |
1493 | 1493 | }; |
1494 | 1494 |
|
|
1622 | 1622 | * override setDate() to allow setting time too within Date object |
1623 | 1623 | */ |
1624 | 1624 | $.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker; |
1625 | | - $.datepicker._setDateDatepicker = function (target, date) { |
| 1625 | + $.datepicker._setDateDatepicker = function (target, _date) { |
1626 | 1626 | var inst = this._getInst(target); |
| 1627 | + var date = _date; |
1627 | 1628 | if (!inst) { |
1628 | 1629 | return; |
1629 | 1630 | } |
1630 | 1631 |
|
1631 | | - if (typeof(date) === 'string') { |
1632 | | - date = new Date(date); |
| 1632 | + if (typeof(_date) === 'string') { |
| 1633 | + date = new Date(_date); |
1633 | 1634 | if (!date.getTime()) { |
1634 | | - $.timepicker.log("Error creating Date object from string."); |
| 1635 | + this._base_setDateDatepicker.apply(this, arguments); |
| 1636 | + date = $(target).datepicker('getDate'); |
1635 | 1637 | } |
1636 | 1638 | } |
1637 | 1639 |
|
|
0 commit comments