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

fix(forms): do not reset the value of the input when it came from the view

Browse Source
This commit is contained in:
vsavkin
2015-07-15 18:16:50 -07:00
parent b1df54501a
commit b1231593b6
11 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/angular2/src/forms/directives/ng_control_name.ts
View File

@ -1,6 +1,6 @@
import {CONST_EXPR} from 'angular2/src/facade/lang';
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
import {List, StringMapWrapper, StringMap} from 'angular2/src/facade/collection';
import {List, StringMap} from 'angular2/src/facade/collection';
import {Directive, LifecycleEvent, Query, QueryList} from 'angular2/angular2';
import {forwardRef, Ancestor, Binding, Inject} from 'angular2/di';
@ -8,7 +8,7 @@ import {forwardRef, Ancestor, Binding, Inject} from 'angular2/di';
import {ControlContainer} from './control_container';
import {NgControl} from './ng_control';
import {NgValidator} from './validators';
import {controlPath, composeNgValidator} from './shared';
import {controlPath, composeNgValidator, isPropertyUpdated} from './shared';
import {Control} from '../model';
const controlNameBinding =
@ -82,6 +82,7 @@ export class NgControlName extends NgControl {
_parent: ControlContainer;
update = new EventEmitter();
model: any;
viewModel: any;
ngValidators: QueryList<NgValidator>;
_added = false;
@ -98,14 +99,18 @@ export class NgControlName extends NgControl {
this.formDirective.addControl(this);
this._added = true;
}
if (StringMapWrapper.contains(c, "model")) {
if (isPropertyUpdated(c, this.viewModel)) {
this.viewModel = this.model;
this.formDirective.updateModel(this, this.model);
}
}
onDestroy() { this.formDirective.removeControl(this); }
viewToModelUpdate(newValue: any): void { ObservableWrapper.callNext(this.update, newValue); }
viewToModelUpdate(newValue: any): void {
this.viewModel = newValue;
ObservableWrapper.callNext(this.update, newValue);
}
get path(): List<string> { return controlPath(this.name, this._parent); }