Skip to content

fix(forms): avoid issues with nulls checking on validation status and… #4338

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
alxhub wants to merge 1 commit into from
Closed

fix(forms): avoid issues with nulls checking on validation status and… #4338

Show file tree
Hide file tree
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
17 changes: 10 additions & 7 deletions modules/angular2/src/core/forms/directives/abstract_control_directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import {AbstractControl} from '../model';
import {isPresent} from 'angular2/src/core/facade/lang';

export class AbstractControlDirective {
get control(): AbstractControl { return null; }

get value(): any { return this.control.value; }
get value(): any { return isPresent(this.control) ? this.control.value : null; }

get valid(): boolean { return this.control.valid; }
get valid(): boolean { return isPresent(this.control) ? this.control.valid : null; }

get errors(): StringMap<string, any> { return this.control.errors; }
get errors(): StringMap<string, any> {
return isPresent(this.control) ? this.control.errors : null;
}

get pristine(): boolean { return this.control.pristine; }
get pristine(): boolean { return isPresent(this.control) ? this.control.pristine : null; }

get dirty(): boolean { return this.control.dirty; }
get dirty(): boolean { return isPresent(this.control) ? this.control.dirty : null; }

get touched(): boolean { return this.control.touched; }
get touched(): boolean { return isPresent(this.control) ? this.control.touched : null; }

get untouched(): boolean { return this.control.untouched; }
get untouched(): boolean { return isPresent(this.control) ? this.control.untouched : null; }
}
13 changes: 13 additions & 0 deletions modules/angular2/test/core/forms/integration_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,19 @@ export function main() {
rootTC.detectChanges();
expect(input.value).toEqual("aa");
})));
it("should not crash when validity is checked from a binding",
inject([TestComponentBuilder], fakeAsync((tcb: TestComponentBuilder) => {
// {{x.valid}} used to crash because valid() tried to read a property
// from form.control before it was set. This test verifies this bug is
// fixed.
var t = `<form><div ng-control-group="x" #x="form">
<input type="text" ng-control="test"></div>{{x.valid}}</form>`;
var rootTC: RootTestComponent;
tcb.overrideTemplate(MyComp, t).createAsync(MyComp).then(
(root) => { rootTC = root; });
tick();
rootTC.detectChanges();
})));
});
});
}
Expand Down