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

fix(forms): fully support rebinding form group directive (#11051)

Browse Source
This commit is contained in:
Kara
2016-08-25 14:37:57 -07:00
committed by Victor Berchet
parent d7c82f5c0f
commit 515ff61fcb
4 changed files with 194 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
View File

@ -17,7 +17,7 @@ import {ControlContainer} from '../control_container';
import {Form} from '../form_interface';
import {NgControl} from '../ng_control';
import {ReactiveErrors} from '../reactive_errors';
import {composeAsyncValidators, composeValidators, setUpControl, setUpFormContainer} from '../shared';
import {cleanUpControl, composeAsyncValidators, composeValidators, setUpControl, setUpFormContainer} from '../shared';
import {FormArrayName, FormGroupName} from './form_group_name';
@ -124,11 +124,9 @@ export class FormGroupDirective extends ControlContainer implements Form,
var async = composeAsyncValidators(this._asyncValidators);
this.form.asyncValidator = Validators.composeAsync([this.form.asyncValidator, async]);
this.form.updateValueAndValidity({onlySelf: true, emitEvent: false});
this._updateDomValue(changes);
}
this._updateDomValue();
}
get submitted(): boolean { return this._submitted; }
@ -189,10 +187,15 @@ export class FormGroupDirective extends ControlContainer implements Form,
}
/** @internal */
_updateDomValue() {
_updateDomValue(changes: SimpleChanges) {
const oldForm = changes['form'].previousValue;
this.directives.forEach(dir => {
var ctrl: any = this.form.get(dir.path);
dir.valueAccessor.writeValue(ctrl.value);
const newCtrl: any = this.form.get(dir.path);
const oldCtrl = oldForm.get(dir.path);
if (oldCtrl !== newCtrl) {
cleanUpControl(oldCtrl, dir);
if (newCtrl) setUpControl(newCtrl, dir);
}
});
}