deac/jQuery-Timepicker-Addon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'vorapoap-master' into dev

Browse source
This commit is contained in:
Trent Richardson 2010-12-17 08:49:07 -05:00
parent aeaaca9e13 021967bd29
commit ee16a9a1ca
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
jquery-ui-timepicker-addon.js vendored
View file

@ -597,10 +597,20 @@ $.extend(Timepicker.prototype, {
if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
return; return;
if (this._defaults.timeOnly === true) formattedDateTime = this.formattedTime; if (this._defaults.timeOnly === true) {
else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) { formattedDateTime = this.formattedTime;
if (this.$altInput) this.$altInput.val(this.formattedTime); if (this.$altInput) {
else formattedDateTime += ' ' + this.formattedTime; this.$altInput.val(this.formattedDateTime);
}
} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
if (this.$altInput) {
if (this._defaults.timeOnly !== true) {
this.$altInput.val(this.$altInput.val() + ' ' + this.formattedTime);
} else {
this.$altInput.val(this.formattedDateTime);
}
}
formattedDateTime += ' ' + this.formattedTime;
} }
this.formattedDateTime = formattedDateTime; this.formattedDateTime = formattedDateTime;