@@ -163,6 +163,7 @@ $.extend(Timepicker.prototype, {
163163 . focus ( function ( ) { $input . trigger ( "focus" ) ; } ) ;
164164
165165 // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
166+ /*
166167 if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
167168 tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
168169 if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date)
@@ -171,7 +172,7 @@ $.extend(Timepicker.prototype, {
171172 tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
172173 if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date)
173174 tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
174-
175+ */
175176 return tp_inst ;
176177 } ,
177178
@@ -513,6 +514,14 @@ $.extend(Timepicker.prototype, {
513514 // min/max date range
514515 //########################################################################
515516 _limitMinMaxDateTime : function ( dp_inst , adjustSliders ) {
517+ if ( $ . datepicker . _get ( dp_inst , 'minDate' ) ) {
518+ this . _defaults . minDateTime = new Date ( $ . datepicker . _get ( dp_inst , 'minDate' ) . getTime ( ) ) ;
519+ this . _defaults . minDate = new Date ( $ . datepicker . _get ( dp_inst , 'minDate' ) . getTime ( ) ) ;
520+ }
521+ if ( $ . datepicker . _get ( dp_inst , 'maxDate' ) ) {
522+ this . _defaults . maxDateTime = new Date ( $ . datepicker . _get ( dp_inst , 'maxDate' ) . getTime ( ) ) ;
523+ this . _defaults . maxDate = new Date ( $ . datepicker . _get ( dp_inst , 'maxDate' ) . getTime ( ) ) ;
524+ }
516525 var o = this . _defaults ,
517526 dp_date = new Date ( dp_inst . selectedYear , dp_inst . selectedMonth , dp_inst . selectedDay ) ;
518527
0 commit comments