javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed all time-picker issues and covered it with tests.

Browse Source
This commit is contained in:
Rossen Hristov
2015-03-17 14:20:04 +02:00
parent 18c368df17
commit ce74b849f5
12 changed files with 198 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/time-picker/time-picker-common.ts
View File

@@ -4,8 +4,8 @@ import proxy = require("ui/core/proxy");
import view = require("ui/core/view");
export class TimePicker extends view.View implements definition.TimePicker {
public static hourProperty = new dependencyObservable.Property("hour", "TimePicker", new proxy.PropertyMetadata(0));
public static minuteProperty = new dependencyObservable.Property("minute", "TimePicker", new proxy.PropertyMetadata(0));
public static hourProperty = new dependencyObservable.Property("hour", "TimePicker", new proxy.PropertyMetadata(undefined));
public static minuteProperty = new dependencyObservable.Property("minute", "TimePicker", new proxy.PropertyMetadata(undefined));
constructor() {
super();

18
ui/time-picker/time-picker.android.ts
View File

@@ -28,6 +28,7 @@ require("utils/module-merge").merge(common, exports);
export class TimePicker extends common.TimePicker {
private _android: android.widget.TimePicker;
private _listener: android.widget.TimePicker.OnTimeChangedListener;
get android(): android.widget.TimePicker {
return this._android;
@@ -38,17 +39,24 @@ export class TimePicker extends common.TimePicker {
var that = new WeakRef(this);
this._android.setOnTimeChangedListener(new android.widget.TimePicker.OnTimeChangedListener({
this._listener = new android.widget.TimePicker.OnTimeChangedListener({
get owner() {
return that.get();
},
onTimeChanged: function (picker: android.widget.TimePicker, hourOfDay: number, minute: number) {
onTimeChanged: function (picker: android.widget.TimePicker, hour: number, minute: number) {
if (this.owner) {
this.owner._onPropertyChangedFromNative(common.TimePicker.hourProperty, hourOfDay);
this.owner._onPropertyChangedFromNative(common.TimePicker.minuteProperty, minute);
if (hour !== this.owner.hour) {
this.owner._onPropertyChangedFromNative(common.TimePicker.hourProperty, hour);
}
if (minute !== this.owner.minute) {
this.owner._onPropertyChangedFromNative(common.TimePicker.minuteProperty, minute);
}
}
}
}));
});
this._android.setOnTimeChangedListener(this._listener);
}
}

30
ui/time-picker/time-picker.ios.ts
View File

@@ -6,7 +6,9 @@ function onHourPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var picker = <TimePicker>data.object;
if (picker.ios) {
setHourAndMinute(picker.ios, data.newValue, picker.minute);
var comps = NSCalendar.currentCalendar().componentsFromDate(NSCalendarUnit.NSCalendarUnitHour | NSCalendarUnit.NSCalendarUnitMinute, picker.ios.date);
comps.hour = data.newValue;
picker.ios.setDateAnimated(NSCalendar.currentCalendar().dateFromComponents(comps), false);
}
}
@@ -16,7 +18,9 @@ function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData)
var picker = <TimePicker>data.object;
if (picker.ios) {
setHourAndMinute(picker.ios, picker.hour, data.newValue);
var comps = NSCalendar.currentCalendar().componentsFromDate(NSCalendarUnit.NSCalendarUnitHour | NSCalendarUnit.NSCalendarUnitMinute, picker.ios.date);
comps.minute = data.newValue;
picker.ios.setDateAnimated(NSCalendar.currentCalendar().dateFromComponents(comps), false);
}
}
@@ -58,24 +62,18 @@ class UITimePickerChangeHandlerImpl extends NSObject {
}
public valueChanged(sender: UIDatePicker) {
var calendar = NSCalendar.currentCalendar();
var comp = calendar.componentsFromDate(NSCalendarUnit.NSHourCalendarUnit | NSCalendarUnit.NSMinuteCalendarUnit, sender.date);
var comps = NSCalendar.currentCalendar().componentsFromDate(NSCalendarUnit.NSCalendarUnitHour | NSCalendarUnit.NSCalendarUnitMinute, sender.date);
this._owner._onPropertyChangedFromNative(common.TimePicker.hourProperty, comp.hour);
this._owner._onPropertyChangedFromNative(common.TimePicker.minuteProperty, comp.minute);
if (comps.hour !== this._owner.hour) {
this._owner._onPropertyChangedFromNative(common.TimePicker.hourProperty, comps.hour);
}
if (comps.minute !== this._owner.minute) {
this._owner._onPropertyChangedFromNative(common.TimePicker.minuteProperty, comps.minute);
}
}
public static ObjCExposedMethods = {
'valueChanged': { returns: interop.types.void, params: [UIDatePicker] }
};
}
function setHourAndMinute(picker: UIDatePicker, hour: number, minute: number) {
var calendar = NSCalendar.currentCalendar();
var comps = new NSDateComponents();
comps.hour = hour;
comps.minute = minute;
picker.setDateAnimated(calendar.dateFromComponents(comps), false);
}