@@ -62,7 +62,7 @@ function Timepicker() {
62
62
minuteMax : 59 ,
63
63
secondMax : 59 ,
64
64
minDateTime : null ,
65
- maxDateTime : null ,
65
+ maxDateTime : null ,
66
66
hourGrid : 0 ,
67
67
minuteGrid : 0 ,
68
68
secondGrid : 0 ,
@@ -132,7 +132,7 @@ $.extend(Timepicker.prototype, {
132
132
}
133
133
}
134
134
tp_inst . _defaults = $ . extend ( { } , this . _defaults , inlineSettings , o , {
135
- beforeShow : function ( input , dp_inst ) {
135
+ beforeShow : function ( input , dp_inst ) {
136
136
if ( $ . isFunction ( o . beforeShow ) )
137
137
o . beforeShow ( input , dp_inst , tp_inst ) ;
138
138
} ,
@@ -502,9 +502,9 @@ $.extend(Timepicker.prototype, {
502
502
var onSelectDelegate = function ( ) {
503
503
tp_inst . _onSelectHandler ( ) ;
504
504
}
505
- this . hour_slider . bind ( 'slidestop' , onSelectDelegate ) ;
506
- this . minute_slider . bind ( 'slidestop' , onSelectDelegate ) ;
507
- this . second_slider . bind ( 'slidestop' , onSelectDelegate ) ;
505
+ this . hour_slider . bind ( 'slidestop' , onSelectDelegate ) ;
506
+ this . minute_slider . bind ( 'slidestop' , onSelectDelegate ) ;
507
+ this . second_slider . bind ( 'slidestop' , onSelectDelegate ) ;
508
508
}
509
509
} ,
510
510
@@ -516,6 +516,8 @@ $.extend(Timepicker.prototype, {
516
516
var o = this . _defaults ,
517
517
dp_date = new Date ( dp_inst . selectedYear , dp_inst . selectedMonth , dp_inst . selectedDay ) ;
518
518
519
+ if ( ! this . _defaults . showTimepicker ) return ; // No time so nothing to check here
520
+
519
521
if ( this . _defaults . minDateTime !== null && dp_date ) {
520
522
var minDateTime = this . _defaults . minDateTime ,
521
523
minDateTimeDate = new Date ( minDateTime . getFullYear ( ) , minDateTime . getMonth ( ) , minDateTime . getDate ( ) , 0 , 0 , 0 , 0 ) ;
@@ -694,7 +696,7 @@ $.extend(Timepicker.prototype, {
694
696
695
697
if ( this . _defaults . timeOnly === true ) {
696
698
formattedDateTime = this . formattedTime ;
697
- } else if ( this . _defaults . timeOnly !== true && ( this . _defaults . alwaysSetTime || timeAvailable ) ) {
699
+ } else if ( this . _defaults . timeOnly !== true && ( this . _defaults . alwaysSetTime || timeAvailable ) ) {
698
700
formattedDateTime += this . _defaults . separator + this . formattedTime ;
699
701
}
700
702
@@ -859,19 +861,20 @@ $.datepicker._gotoToday = function(id) {
859
861
$ . datepicker . _disableTimepickerDatepicker = function ( target , date , withDate ) {
860
862
var inst = this . _getInst ( target ) ,
861
863
tp_inst = this . _get ( inst , 'timepicker' ) ;
864
+ $ ( target ) . datepicker ( 'getDate' ) ; // Init selected[Year|Month|Day]
862
865
if ( tp_inst ) {
863
866
tp_inst . _defaults . showTimepicker = false ;
864
- tp_inst . _onTimeChange ( ) ;
865
867
tp_inst . _updateDateTime ( inst ) ;
866
868
}
867
869
} ;
868
870
869
871
$ . datepicker . _enableTimepickerDatepicker = function ( target , date , withDate ) {
870
872
var inst = this . _getInst ( target ) ,
871
873
tp_inst = this . _get ( inst , 'timepicker' ) ;
874
+ $ ( target ) . datepicker ( 'getDate' ) ; // Init selected[Year|Month|Day]
872
875
if ( tp_inst ) {
873
876
tp_inst . _defaults . showTimepicker = true ;
874
- tp_inst . _onTimeChange ( ) ;
877
+ tp_inst . _addTimePicker ( inst ) ; // Could be disabled on page load
875
878
tp_inst . _updateDateTime ( inst ) ;
876
879
}
877
880
} ;
0 commit comments