File tree 1 file changed +10
-5
lines changed
1 file changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -493,16 +493,21 @@ class TimePicker extends UI5Element {
493
493
minutesSlider = this . minutesSlider ,
494
494
hoursSlider = this . hoursSlider ,
495
495
periodsSlider = this . periodsSlider ,
496
- hours = hoursSlider ? hoursSlider . getAttribute ( "value" ) : this . _hoursParameters . minHour . toString ( ) ,
497
496
minutes = minutesSlider ? minutesSlider . getAttribute ( "value" ) : "0" ,
498
497
seconds = secondsSlider ? secondsSlider . getAttribute ( "value" ) : "0" ,
499
498
period = periodsSlider ? periodsSlider . getAttribute ( "value" ) : this . periodsArray [ 0 ] ;
500
499
501
- if ( this . _hoursParameters . isTwelveHoursFormat && period === this . periodsArray [ 0 ] ) {
502
- selectedDate . setHours ( hours * 1 + 12 ) ;
503
- } else {
504
- selectedDate . setHours ( hours ) ;
500
+ let hours = hoursSlider ? hoursSlider . getAttribute ( "value" ) : this . _hoursParameters . minHour . toString ( ) ;
501
+
502
+ if ( period === this . periodsArray [ 0 ] ) { // AM
503
+ hours = hours === "12" ? 0 : hours ;
505
504
}
505
+
506
+ if ( period === this . periodsArray [ 1 ] ) { // PM
507
+ hours = hours === "12" ? hours : hours * 1 + 12 ;
508
+ }
509
+
510
+ selectedDate . setHours ( hours ) ;
506
511
selectedDate . setMinutes ( minutes ) ;
507
512
selectedDate . setSeconds ( seconds ) ;
508
513
You can’t perform that action at this time.
0 commit comments