Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion jquery-ui-timepicker-addon.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ function Timepicker() {
alwaysSetTime: true,
separator: ' ',
altFieldTimeOnly: true,
altSeparator: null,
altTimeSuffix: null,
showTimepicker: true,
timezoneIso8601: false,
timezoneList: null,
Expand Down Expand Up @@ -859,8 +861,21 @@ $.extend(Timepicker.prototype, {
this.$altInput.val(this.formattedTime);
this.$input.val(this.formattedDate);
} else if(this.$altInput) {
this.$altInput.val(formattedDateTime);
this.$input.val(formattedDateTime);
var altFormattedDateTime = '',
altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
if (this._defaults.altFormat)
altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
else
altFormattedDateTime = this.formattedDate;
if (altFormattedDateTime)
altFormattedDateTime += altSeparator;
if (this._defaults.altTimeFormat)
altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
else
altFormattedDateTime += this.formattedTime + altTimeSuffix;
this.$altInput.val(altFormattedDateTime);
} else {
this.$input.val(formattedDateTime);
}
Expand Down