From c9be5b72e7e748088e9e450cdeae8b99e4b070b2 Mon Sep 17 00:00:00 2001
From: root <matthias.althaus matthias.althaus@iserv.eu>
Date: Fri, 15 Apr 2011 13:12:38 +0200
Subject: [PATCH] Cleaing some whitespace Fixing show/hide time for calendar
 use case

---
 jquery-ui-timepicker-addon.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 402f0aa..d72d90a 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -62,7 +62,7 @@ function Timepicker() {
 		minuteMax: 59,
 		secondMax: 59,
 		minDateTime: null,
-		maxDateTime: null,		
+		maxDateTime: null,
 		hourGrid: 0,
 		minuteGrid: 0,
 		secondGrid: 0,
@@ -132,7 +132,7 @@ $.extend(Timepicker.prototype, {
 			}
 		}
 		tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
-			beforeShow: function(input, dp_inst) {			
+			beforeShow: function(input, dp_inst) {
 				if ($.isFunction(o.beforeShow))
 					o.beforeShow(input, dp_inst, tp_inst);
 			},
@@ -502,9 +502,9 @@ $.extend(Timepicker.prototype, {
 			var onSelectDelegate = function() {
 				tp_inst._onSelectHandler();
 			}
-			this.hour_slider.bind('slidestop',onSelectDelegate);		
-			this.minute_slider.bind('slidestop',onSelectDelegate);		
-			this.second_slider.bind('slidestop',onSelectDelegate);		
+			this.hour_slider.bind('slidestop',onSelectDelegate);
+			this.minute_slider.bind('slidestop',onSelectDelegate);
+			this.second_slider.bind('slidestop',onSelectDelegate);
 		}
 	},
 
@@ -516,6 +516,8 @@ $.extend(Timepicker.prototype, {
 		var o = this._defaults,
 			dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
 
+		if(!this._defaults.showTimepicker) return; // No time so nothing to check here
+
 		if(this._defaults.minDateTime !== null && dp_date){
 			var minDateTime = this._defaults.minDateTime,
 				minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
@@ -694,7 +696,7 @@ $.extend(Timepicker.prototype, {
 
 		if (this._defaults.timeOnly === true) {
 			formattedDateTime = this.formattedTime;
-		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {			
+		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
 			formattedDateTime += this._defaults.separator + this.formattedTime;
 		}
 
@@ -859,9 +861,9 @@ $.datepicker._gotoToday = function(id) {
 $.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
 	var inst = this._getInst(target),
 	tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
 	if (tp_inst) {
 		tp_inst._defaults.showTimepicker = false;
-		tp_inst._onTimeChange();
 		tp_inst._updateDateTime(inst);
 	}
 };
@@ -869,9 +871,10 @@ $.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
 $.datepicker._enableTimepickerDatepicker = function(target, date, withDate) {
 	var inst = this._getInst(target),
 	tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
 	if (tp_inst) {
 		tp_inst._defaults.showTimepicker = true;
-		tp_inst._onTimeChange();
+		tp_inst._addTimePicker(inst); // Could be disabled on page load
 		tp_inst._updateDateTime(inst);
 	}
 };