fix(forms): update compose to handle null validators

angular · Oct 28, 2015 · 1571596 · 1571596
1 parent c0931af
commit 1571596
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/angular2/src/core/forms/validators.ts b/modules/angular2/src/core/forms/validators.ts
@@ -1,5 +1,4 @@
-import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
-import {CONST_EXPR} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {OpaqueToken} from 'angular2/src/core/di';
 
@@ -48,7 +47,7 @@ export class Validators {
 
     return function(control: modelModule.AbstractControl) {
       var res = ListWrapper.reduce(validators, (res, validator) => {
-        var errors = validator(control);
+        var errors = isPresent(validator) ? validator(control) : null;
         return isPresent(errors) ? StringMapWrapper.merge(<any>res, <any>errors) : res;
       }, {});
       return StringMapWrapper.isEmpty(res) ? null : res;

diff --git a/modules/angular2/test/core/forms/validators_spec.ts b/modules/angular2/test/core/forms/validators_spec.ts
@@ -82,6 +82,11 @@ export function main() {
         var c = Validators.compose([Validators.nullValidator, Validators.nullValidator]);
         expect(c(new Control(""))).toEqual(null);
       });
+
+      it("should ignore nulls", () => {
+        var c = Validators.compose([null, Validators.required]);
+        expect(c(new Control(""))).toEqual({"required": true});
+      });
     });
   });
 }