Skip to content

Add a cancelled event to the date/time picker #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Add a cancelled event to the date/time picker #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
833127c
Add cancelled event
yassilah Aug 19, 2019
a626ec0
Add cancelled event to TimePicker
yassilah Aug 19, 2019
4ab126f
Merge branch 'master' into patch-1
yassilah Aug 21, 2019
7aa086f
cleaner code for event args
yassilah Aug 21, 2019
f6f3099
cleaner code for event args
yassilah Aug 21, 2019
2e625de
Fixed lint errors
yassilah Sep 1, 2019
357e4bd
Merge branch 'master' into patch-1
elena-p Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/ui/date-picker-field.common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export class DatePickerFieldBase extends PickerFieldBase implements DatePickerFi
public pickerDefaultDate: Date;
public static datePickerOpenedEvent = "datePickerOpened";
public static datePickerClosedEvent = "datePickerClosed";
public static datePickerCancelledEvent = "datePickerCancelled";

private _nativeLocale: any;
private _nativeDateFormatter: any;
Expand Down Expand Up @@ -62,13 +63,16 @@ export class DatePickerFieldBase extends PickerFieldBase implements DatePickerFi
cancelButtonText: this.pickerCancelText
}, style)
.then((result: Date) => {
const args = <EventData>{
eventName: DatePickerFieldBase.datePickerCancelledEvent,
object: this
};

if (result) {
this.date = result;
args.eventName = DatePickerFieldBase.datePickerClosedEvent;
}
let args = <EventData>{
eventName: DatePickerFieldBase.datePickerClosedEvent,
object: this
};

this.notify(args);
})
.catch((err) => {
Expand Down Expand Up @@ -132,4 +136,4 @@ DatePickerFieldBase.dateProperty.register(DatePickerFieldBase);
DatePickerFieldBase.maxDateProperty.register(DatePickerFieldBase);
DatePickerFieldBase.minDateProperty.register(DatePickerFieldBase);
DatePickerFieldBase.dateFormatProperty.register(DatePickerFieldBase);
DatePickerFieldBase.pickerDefaultDateProperty.register(DatePickerFieldBase);
DatePickerFieldBase.pickerDefaultDateProperty.register(DatePickerFieldBase);
14 changes: 9 additions & 5 deletions src/ui/time-picker-field.common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class TimePickerFieldBase extends PickerFieldBase implements TimePickerFi
public pickerDefaultTime: Date;
public static timePickerOpenedEvent = "timePickerOpened";
public static timePickerClosedEvent = "timePickerClosed";
public static timePickerCancelledEvent = "timePickerCancelled";

private _nativeLocale: any;
private _nativeTimeFormatter: any;
Expand Down Expand Up @@ -47,13 +48,16 @@ export class TimePickerFieldBase extends PickerFieldBase implements TimePickerFi
is24Hours: this.is24Hours(this._nativeTimeFormatter)
}, style)
.then((result: Date) => {
const args = <EventData>{
eventName: TimePickerFieldBase.timePickerCancelledEvent,
object: this
};

if (result) {
this.time = result;
args.eventName = TimePickerFieldBase.timePickerClosedEvent;
}
let args = <EventData>{
eventName: TimePickerFieldBase.timePickerClosedEvent,
object: this
};

this.notify(args);
})
.catch((err) => {
Expand Down Expand Up @@ -156,4 +160,4 @@ export function timeValueConverter(timeString: string) {
}
TimePickerFieldBase.timeProperty.register(TimePickerFieldBase);
TimePickerFieldBase.timeFormatProperty.register(TimePickerFieldBase);
TimePickerFieldBase.pickerDefaultTimeProperty.register(TimePickerFieldBase);
TimePickerFieldBase.pickerDefaultTimeProperty.register(TimePickerFieldBase);
Loading