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

chore(): sync with master

Browse Source
This commit is contained in:
Liam DeBeasi
2020-09-21 11:36:45 -04:00
parent fbe11582e9 ec9e0a2ee7
commit 9ca8b9de46
139 changed files with 4410 additions and 1938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/components/datetime/datetime.tsx
View File

@ -282,6 +282,12 @@ export class Datetime implements ComponentInterface {
value: colOptions[colSelectedIndex].value
};
if (data.name !== 'ampm' && this.datetimeValue.ampm !== undefined) {
changeData['ampm'] = {
value: this.datetimeValue.ampm
}
}
this.updateDatetimeValue(changeData);
picker.columns = this.generateColumns();
});