@@ -62,7 +62,7 @@ function Timepicker() {
6262 minuteMax : 59 ,
6363 secondMax : 59 ,
6464 minDateTime : null ,
65- maxDateTime : null ,
65+ maxDateTime : null ,
6666 hourGrid : 0 ,
6767 minuteGrid : 0 ,
6868 secondGrid : 0 ,
@@ -132,7 +132,7 @@ $.extend(Timepicker.prototype, {
132132 }
133133 }
134134 tp_inst . _defaults = $ . extend ( { } , this . _defaults , inlineSettings , o , {
135- beforeShow : function ( input , dp_inst ) {
135+ beforeShow : function ( input , dp_inst ) {
136136 if ( $ . isFunction ( o . beforeShow ) )
137137 o . beforeShow ( input , dp_inst , tp_inst ) ;
138138 } ,
@@ -502,9 +502,9 @@ $.extend(Timepicker.prototype, {
502502 var onSelectDelegate = function ( ) {
503503 tp_inst . _onSelectHandler ( ) ;
504504 }
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 ) ;
508508 }
509509 } ,
510510
@@ -516,6 +516,8 @@ $.extend(Timepicker.prototype, {
516516 var o = this . _defaults ,
517517 dp_date = new Date ( dp_inst . selectedYear , dp_inst . selectedMonth , dp_inst . selectedDay ) ;
518518
519+ if ( ! this . _defaults . showTimepicker ) return ; // No time so nothing to check here
520+
519521 if ( this . _defaults . minDateTime !== null && dp_date ) {
520522 var minDateTime = this . _defaults . minDateTime ,
521523 minDateTimeDate = new Date ( minDateTime . getFullYear ( ) , minDateTime . getMonth ( ) , minDateTime . getDate ( ) , 0 , 0 , 0 , 0 ) ;
@@ -694,7 +696,7 @@ $.extend(Timepicker.prototype, {
694696
695697 if ( this . _defaults . timeOnly === true ) {
696698 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 ) ) {
698700 formattedDateTime += this . _defaults . separator + this . formattedTime ;
699701 }
700702
@@ -859,19 +861,20 @@ $.datepicker._gotoToday = function(id) {
859861$ . datepicker . _disableTimepickerDatepicker = function ( target , date , withDate ) {
860862 var inst = this . _getInst ( target ) ,
861863 tp_inst = this . _get ( inst , 'timepicker' ) ;
864+ $ ( target ) . datepicker ( 'getDate' ) ; // Init selected[Year|Month|Day]
862865 if ( tp_inst ) {
863866 tp_inst . _defaults . showTimepicker = false ;
864- tp_inst . _onTimeChange ( ) ;
865867 tp_inst . _updateDateTime ( inst ) ;
866868 }
867869} ;
868870
869871$ . datepicker . _enableTimepickerDatepicker = function ( target , date , withDate ) {
870872 var inst = this . _getInst ( target ) ,
871873 tp_inst = this . _get ( inst , 'timepicker' ) ;
874+ $ ( target ) . datepicker ( 'getDate' ) ; // Init selected[Year|Month|Day]
872875 if ( tp_inst ) {
873876 tp_inst . _defaults . showTimepicker = true ;
874- tp_inst . _onTimeChange ( ) ;
877+ tp_inst . _addTimePicker ( inst ) ; // Could be disabled on page load
875878 tp_inst . _updateDateTime ( inst ) ;
876879 }
877880} ;
0 commit comments