Skip to content

Commit 173f015

Browse files
committed
Merge branch 'issue-576-datetime' of https://github.com/c-eiser13/sp-dev-fx-controls-react into c-eiser13-issue-576-datetime
2 parents 70bb2c2 + e7a50d4 commit 173f015

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/controls/dateTimePicker/DateTimePicker.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ export class DateTimePicker extends React.Component<IDateTimePickerProps, IDateT
128128
if (hoursSplit[1] && hoursSplit[1].toLowerCase().indexOf("pm") !== -1) {
129129
hours += 12;
130130
if (hours === 24) {
131+
//this is noon - set to 12 not 0
132+
//hours = 0;
133+
hours = 12;
134+
}
135+
}
136+
else {
137+
//am - if hours == 12, set hours to 0 here
138+
if (hours == 12){
131139
hours = 0;
132140
}
133141
}

0 commit comments

Comments
 (0)