From 2e9005b2e8da1372dfce09470c12573ce371cd85 Mon Sep 17 00:00:00 2001 From: Alexander Gitter Date: Sat, 11 Jun 2011 13:30:19 +0200 Subject: [PATCH] Use actual min/maxDateTime values which might have been set via $(...).datetimepicker.('option', 'min/maxDateTime' ...) --- jquery-ui-timepicker-addon.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 79bc184..1cf6fbb 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -519,8 +519,8 @@ $.extend(Timepicker.prototype, { if(!this._defaults.showTimepicker) return; // No time so nothing to check here - if(this._defaults.minDateTime !== null && dp_date){ - var minDateTime = this._defaults.minDateTime, + if($.datepicker._get(dp_inst, 'minDateTime') !== null && dp_date){ + var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'), minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0); if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null){ @@ -552,8 +552,8 @@ $.extend(Timepicker.prototype, { } } - if(this._defaults.maxDateTime !== null && dp_date){ - var maxDateTime = this._defaults.maxDateTime, + if($.datepicker._get(dp_inst, 'maxDateTime') !== null && dp_date){ + var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'), maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0); if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){