cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(forms): handle dirty/pristine explicitly

Browse Source
This commit is contained in:
vsavkin
2015-06-03 11:54:39 -07:00
parent 31b6687894
commit 96cadcc29e
3 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/angular2/src/forms/directives/shared.ts
View File

@ -23,13 +23,14 @@ export function setUpControl(c: Control, dir: ControlDirective) {
dir.valueAccessor.registerOnChange(newValue => {
dir.viewToModelUpdate(newValue);
c.updateValue(newValue);
c.markAsDirty();
});
// model -> view
c.registerOnChange(newValue => dir.valueAccessor.writeValue(newValue));
// touched
dir.valueAccessor.registerOnTouched(() => c.touch());
dir.valueAccessor.registerOnTouched(() => c.markAsTouched());
}
function _throwError(dir: ControlDirective, message: string): void {

12
modules/angular2/src/forms/model.ts
View File

@ -60,7 +60,16 @@ export class AbstractControl {
get valueChanges(): Observable { return this._valueChanges; }
touch(): void { this._touched = true; }
markAsTouched(): void { this._touched = true; }
markAsDirty({onlySelf}: {onlySelf?: boolean} = {}): void {
onlySelf = isPresent(onlySelf) ? onlySelf : false;
this._pristine = false;
if (isPresent(this._parent) && !onlySelf) {
this._parent.markAsDirty({onlySelf: onlySelf});
}
}
setParent(parent) { this._parent = parent; }
@ -80,7 +89,6 @@ export class AbstractControl {
emitEvent = isPresent(emitEvent) ? emitEvent : true;
this._updateValue();
this._pristine = false;
if (emitEvent) {
ObservableWrapper.callNext(this._valueChanges, this._value);