Skip to content

Commit 13f9cfe

Browse files
author
Nedyalko Nikolov
committed
Change time only once due to Angular issues.
1 parent fdabcec commit 13f9cfe

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

ui/time-picker/time-picker-common.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ function onHourPropertyChanged(data: dependencyObservable.PropertyChangeData) {
8484

8585
if (isValidTime(picker)) {
8686
picker._setNativeTime();
87-
picker.time = new Date(0, 0, 0, picker.hour, picker.minute);
87+
if (picker.time) {
88+
picker.time.setHours(picker.hour);
89+
}
90+
else {
91+
picker.time = new Date(0, 0, 0, picker.hour, picker.minute);
92+
}
8893
} else {
8994
throw new Error(getErrorMessage(picker, "Hour", data.newValue));
9095
}
@@ -95,7 +100,12 @@ function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData)
95100

96101
if (isValidTime(picker)) {
97102
picker._setNativeTime();
98-
picker.time = new Date(0, 0, 0, picker.hour, picker.minute);
103+
if (picker.time) {
104+
picker.time.setMinutes(picker.minute);
105+
}
106+
else {
107+
picker.time = new Date(0, 0, 0, picker.hour, picker.minute);
108+
}
99109
} else {
100110
throw new Error(getErrorMessage(picker, "Minute", data.newValue));
101111
}

ui/time-picker/time-picker.android.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class TimePicker extends common.TimePicker {
2626
if (this.owner) {
2727
var validTime = common.getValidTime(this.owner, hour, minute);
2828
this.owner._setNativeValueSilently(validTime.hour, validTime.minute);
29+
this.owner._onPropertyChangedFromNative(common.TimePicker.timeProperty, new Date(0, 0, 0, hour, minute));
2930
}
3031
}
3132
});

0 commit comments

Comments
 (0)