javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 07:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(datetime): remove the automatic switching from am to pm (#22207)

Browse Source 
fixes #18924 fixes #22171 fixes #22199
This commit is contained in:
Brandy Carney
2020-09-29 16:32:21 -04:00
committed by GitHub
parent d03807a443
commit f81d18c6f9
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/components/datetime/datetime-util.ts
View File

@ -326,24 +326,6 @@ export const updateDate = (existingData: DatetimeData, newData: any, displayTime
// newData is from the datetime picker's selected values // newData is from the datetime picker's selected values
// update the existing datetimeValue with the new values // update the existing datetimeValue with the new values
if (newData.ampm !== undefined && newData.hour !== undefined) { if (newData.ampm !== undefined && newData.hour !== undefined) {
// If the date we came from exists, we need to change the meridiem value when
// going to and from 12
if (existingData.ampm !== undefined && existingData.hour !== undefined) {
// If the existing meridiem is am, we want to switch to pm if it is either
// A) coming from 0 (12 am)
// B) going to 12 (12 pm)
if (existingData.ampm === 'am' && (existingData.hour === 0 || newData.hour.value === 12)) {
newData.ampm.value = 'pm';
}
// If the existing meridiem is pm, we want to switch to am if it is either
// A) coming from 12 (12 pm)
// B) going to 12 (12 am)
if (existingData.ampm === 'pm' && (existingData.hour === 12 || newData.hour.value === 12)) {
newData.ampm.value = 'am';
}
}
// change the value of the hour based on whether or not it is am or pm // change the value of the hour based on whether or not it is am or pm
// if the meridiem is pm and equal to 12, it remains 12 // if the meridiem is pm and equal to 12, it remains 12
// otherwise we add 12 to the hour value // otherwise we add 12 to the hour value