@@ -607,13 +607,18 @@ $.extend(Timepicker.prototype, {
607
607
minute = ( this . minute_slider ) ? this . minute_slider . slider ( 'value' ) : false ,
608
608
second = ( this . second_slider ) ? this . second_slider . slider ( 'value' ) : false ,
609
609
timezone = ( this . timezone_select ) ? this . timezone_select . val ( ) : false ;
610
-
610
+
611
+ if ( typeof ( hour ) == 'object' ) hour = false ;
612
+ if ( typeof ( minute ) == 'object' ) minute = false ;
613
+ if ( typeof ( second ) == 'object' ) second = false ;
614
+ if ( typeof ( timezone ) == 'object' ) timezone = false ;
615
+
611
616
if ( hour !== false ) hour = parseInt ( hour , 10 ) ;
612
617
if ( minute !== false ) minute = parseInt ( minute , 10 ) ;
613
618
if ( second !== false ) second = parseInt ( second , 10 ) ;
614
619
615
620
var ampm = ( hour < 12 ) ? 'AM' : 'PM' ;
616
-
621
+
617
622
// If the update was done in the input field, the input field should not be updated.
618
623
// If the update was done using the sliders, update the input field.
619
624
var hasChanged = ( hour != this . hour || minute != this . minute || second != this . second || ( this . ampm . length > 0 && this . ampm != ampm ) || timezone != this . timezone ) ;
@@ -909,12 +914,13 @@ $.datepicker._setTime = function(inst, date) {
909
914
second = defaults . secondMin ;
910
915
}
911
916
917
+ tp_inst . hour = hour ;
918
+ tp_inst . minute = minute ;
919
+ tp_inst . second = second ;
920
+
912
921
if ( tp_inst . hour_slider ) tp_inst . hour_slider . slider ( 'value' , hour ) ;
913
- else tp_inst . hour = hour ;
914
922
if ( tp_inst . minute_slider ) tp_inst . minute_slider . slider ( 'value' , minute ) ;
915
- else tp_inst . minute = minute ;
916
923
if ( tp_inst . second_slider ) tp_inst . second_slider . slider ( 'value' , second ) ;
917
- else tp_inst . second = second ;
918
924
919
925
tp_inst . _onTimeChange ( ) ;
920
926
tp_inst . _updateDateTime ( inst ) ;
0 commit comments