Skip to content

Commit c00fa6d

Browse files
Fixed !!date issue and can use only minDate or minDateTime as options
1 parent 895d27f commit c00fa6d

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

jquery-ui-timepicker-addon.js

+14-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery timepicker addon
33
* By: Trent Richardson [http://trentrichardson.com]
44
* Version 0.9.2-dev
5-
* Last Modified: 12/17/2010
5+
* Last Modified: 12/22/2010
66
*
77
* Copyright 2010 Trent Richardson
88
* Dual licensed under the MIT and GPL licenses.
@@ -149,6 +149,17 @@ $.extend(Timepicker.prototype, {
149149
},
150150
timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
151151
});
152+
153+
// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
154+
if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate !== null)
155+
tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
156+
if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime !== null)
157+
tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
158+
if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate !== null)
159+
tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
160+
if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime !== null)
161+
tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
162+
152163
return tp_inst;
153164
},
154165

@@ -499,7 +510,7 @@ $.extend(Timepicker.prototype, {
499510
this._defaults.minuteMax = maxDateTime.getMinutes();
500511
this._defaults.secondMax = maxDateTime.getSeconds();
501512

502-
if(this.hour > this._defaults.hourMax) this.hour = this._defaults.hourMax;
513+
if(this.hour > this._defaults.hourMax){ this.hour = this._defaults.hourMax; }
503514
if(this.minute > this._defaults.minuteMax) this.minute = this._defaults.minuteMax;
504515
if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax;
505516
}else{
@@ -822,7 +833,7 @@ $.datepicker._setTimeDatepicker = function(target, date, withDate) {
822833
$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
823834
$.datepicker._setDateDatepicker = function(target, date) {
824835
var inst = this._getInst(target),
825-
tp_date = !!date ? new Date(date.getTime()) : date;
836+
tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
826837

827838
this._updateDatepicker(inst);
828839
this._base_setDateDatepicker.apply(this, arguments);

0 commit comments

Comments
 (0)