Fix bug where ampm is not displayed when first initiated

This commit is contained in:
Trent Richardson 2011-01-19 16:26:46 -05:00
parent 999803035f
commit 9efeb990d2

View file

@ -562,14 +562,12 @@ $.extend(Timepicker.prototype, {
if (hasChanged) { if (hasChanged) {
if (hour !== false) { if (hour !== false)this.hour = hour;
this.hour = hour;
if (this._defaults.ampm) this.ampm = ampm;
}
if (minute !== false) this.minute = minute; if (minute !== false) this.minute = minute;
if (second !== false) this.second = second; if (second !== false) this.second = second;
} }
if (this._defaults.ampm) this.ampm = ampm;
this._formatTime(); this._formatTime();
if (this.$timeObj) this.$timeObj.text(this.formattedTime); if (this.$timeObj) this.$timeObj.text(this.formattedTime);
this.timeDefined = true; this.timeDefined = true;