Skip to content

fix(datepicker): makes sure the datepickerInput is registered #7049

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

Merged
merged 1 commit into from
Sep 13, 2017
Merged

fix(datepicker): makes sure the datepickerInput is registered #7049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions src/lib/datepicker/datepicker-input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,22 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
/** The datepicker that this input is associated with. */
@Input()
set mdDatepicker(value: MdDatepicker<D>) {
this.registerDatepicker(value);
}
_datepicker: MdDatepicker<D>;

private registerDatepicker(value: MdDatepicker<D>) {
if (value) {
this._datepicker = value;
this._datepicker._registerInput(this);
}
}
_datepicker: MdDatepicker<D>;

@Input() set matDatepicker(value: MdDatepicker<D>) { this.mdDatepicker = value; }
@Input() set matDatepicker(value: MdDatepicker<D>) {
// Note that we don't set `this.mdDatepicker = value` here,
// because that line gets stripped by the JS compiler.
this.registerDatepicker(value);
}

@Input() set mdDatepickerFilter(filter: (date: D | null) => boolean) {
this._dateFilter = filter;
Expand Down