clean(forms): cleanup

modules/angular2/src/facade/collection.dart

@@ -68,11 +68,8 @@ class StringMapWrapper {
     m.forEach((k, v) => fn(v, k));
   }
   static HashMap merge(HashMap a, HashMap b) {
-    var m = {};
+    var m = new HashMap.from(a);
-
-    a.forEach((k, v) => m[k] = v);
     b.forEach((k, v) => m[k] = v);
-
     return m;
   }
   static bool isEmpty(Map m) => m.isEmpty;

modules/angular2/src/forms/model.js

@@ -9,6 +9,7 @@ export const INVALID = "INVALID";
 //  get value():any;
 //  validator:Function;
 //  get status():string;
+//  get valid():boolean;
 //  get errors():Map;
 //  get active():boolean {}
 //  updateValue(value:any){}
@@ -19,19 +20,19 @@ export class Control {
   _value:any;
   _status:string;
   _errors;
-  _updated:boolean;
+  _dirty:boolean;
   _parent:ControlGroup;
   validator:Function;
 
   constructor(value:any, validator:Function = nullValidator) {
     this._value = value;
     this.validator = validator;
-    this._updated = true;
+    this._dirty = true;
   }
 
   updateValue(value:any) {
     this._value = value;
-    this._updated = true;
+    this._dirty = true;
     this._updateParent();
   }
 
@@ -63,8 +64,8 @@ export class Control {
   }
 
   _updateIfNeeded() {
-    if (this._updated) {
+    if (this._dirty) {
-      this._updated = false;
+      this._dirty = false;
       this._errors = this.validator(this);
       this._status = isPresent(this._errors) ? INVALID : VALID;
     }
@@ -81,14 +82,14 @@ export class ControlGroup {
   _value:any;
   _status:string;
   _errors;
-  _updated:boolean;
+  _dirty:boolean;
   validator:Function;
   controls;
 
   constructor(controls, validator:Function = controlGroupValidator) {
     this.controls = controls;
     this.validator = validator;
-    this._updated = true;
+    this._dirty = true;
     this._setParentForControls();
   }
 
@@ -119,8 +120,8 @@ export class ControlGroup {
   }
 
   _updateIfNeeded() {
-    if (this._updated) {
+    if (this._dirty) {
-      this._updated = false;
+      this._dirty = false;
       this._value = this._reduceValue();
       this._errors = this.validator(this);
       this._status = isPresent(this._errors) ? INVALID : VALID;
@@ -138,7 +139,7 @@ export class ControlGroup {
   }
 
   _controlChanged() {
-    this._updated = true;
+    this._dirty = true;
   }
 }
 

modules/angular2/src/forms/validator_directives.js

@@ -1,8 +1,6 @@
-import {isBlank, isPresent} from 'angular2/src/facade/lang';
-import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
 import {Decorator} from 'angular2/core';
 
-import {ControlGroup, Control, ControlDirective} from 'angular2/forms';
+import {ControlDirective} from 'angular2/forms';
 import * as validators from 'angular2/forms';
 
 @Decorator({

modules/angular2/src/forms/validators.js

@@ -25,7 +25,12 @@ export function controlGroupValidator(c:ControlGroup) {
   var res = {};
   StringMapWrapper.forEach(c.controls, (control, name) => {
     if (control.active && isPresent(control.errors)) {
-      res[name] = control.errors;
+      StringMapWrapper.forEach(control.errors, (value, error) => {
+        if (! StringMapWrapper.contains(res, error)) {
+          res[error] = [];
+        }
+        ListWrapper.push(res[error], control);
+      });
     }
   });
   return StringMapWrapper.isEmpty(res) ? null : res;

modules/angular2/test/forms/model_spec.js

@@ -51,13 +51,12 @@ export function main() {
       });
 
       it("should run the validator with the initial value (invalid)", () => {
-        var g = new ControlGroup({
+        var one = new Control(null, validations.required);
-          "one": new Control(null, validations.required)
+        var g = new ControlGroup({"one": one});
-        });
 
         expect(g.valid).toEqual(false);
 
-        expect(g.errors).toEqual({"one": {"required" : true}});
+        expect(g.errors).toEqual({"required": [one]});
       });
 
       it("should run the validator with the value changes", () => {

modules/angular2/test/forms/validators_spec.js

@@ -44,25 +44,23 @@ export function main() {
 
     describe("controlGroupValidator", () => {
       it("should collect errors from the child controls", () => {
-        var g = new ControlGroup({
+        var one = new Control("one", validator("a", true));
-          "one" : new Control("one", validator("a", true)),
+        var two = new Control("one", validator("b", true));
-          "two" : new Control("two", validator("b", true))
+        var g = new ControlGroup({"one" : one, "two" : two});
-        });
 
         expect(controlGroupValidator(g)).toEqual({
-          "one" : {"a" : true},
+          "a" : [one],
-          "two" : {"b" : true}
+          "b" : [two]
         });
       });
 
-      it("should not include keys for controls that have no errors", () => {
+      it("should not include controls that have no errors", () => {
-        var g = new ControlGroup({
+        var one = new Control("one", validator("a", true));
-          "one" : new Control("one", validator("a", true)),
+        var two = new Control("two");
-          "two" : new Control("one")
+        var g = new ControlGroup({"one" : one, "two" : two});
-        });
 
         expect(controlGroupValidator(g)).toEqual({
-          "one" : {"a" : true}
+          "a": [one]
         });
       });