From 6736bf73d76ff8c00b9bb3e0e325d85e5c4f47eb Mon Sep 17 00:00:00 2001 From: Nedyalko Nikolov Date: Mon, 7 Nov 2016 15:38:29 +0200 Subject: [PATCH] Fixed DatePicker issues with date 7-th. --- tns-core-modules/ui/date-picker/date-picker.android.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tns-core-modules/ui/date-picker/date-picker.android.ts b/tns-core-modules/ui/date-picker/date-picker.android.ts index c147e146c..30879fb5f 100644 --- a/tns-core-modules/ui/date-picker/date-picker.android.ts +++ b/tns-core-modules/ui/date-picker/date-picker.android.ts @@ -27,7 +27,7 @@ function onMonthPropertyChanged(data: dependencyObservable.PropertyChangeData) { function onDayPropertyChanged(data: dependencyObservable.PropertyChangeData) { var picker = data.object; - if (picker.android && picker.android.getDayOfMonth !== data.newValue) { + if (picker.android && picker.android.getDayOfMonth() !== data.newValue) { updateNativeDate(picker); } } @@ -36,7 +36,7 @@ function onDayPropertyChanged(data: dependencyObservable.PropertyChangeData) { function updateNativeDate(picker: DatePicker) { var year = types.isNumber(picker.year) ? picker.year : picker.android.getYear(); - var month = types.isNumber(picker.month) ? (picker.month - 1) : picker.android.getMonth(); + var month = types.isNumber(picker.month) ? (picker.month - 1) : Math.max(0, picker.android.getMonth() - 1); var day = types.isNumber(picker.day) ? picker.day : picker.android.getDayOfMonth(); picker.date = new Date(year, month, day); @@ -68,7 +68,7 @@ function onDatePropertyChanged(data: dependencyObservable.PropertyChangeData) { var picker = data.object; var newValue = data.newValue; - if (picker.android && (picker.android.getDayOfMonth() !== newValue.getDay() + if (picker.android && (picker.android.getDayOfMonth() !== newValue.getDate() || picker.android.getMonth() !== newValue.getMonth() || picker.android.getYear() !== newValue.getFullYear())) { picker.android.updateDate(newValue.getFullYear(), newValue.getMonth(), newValue.getDate());