diff --git a/modules/examples/src/order_management/index.ts b/modules/examples/src/order_management/index.ts index 5ed87047d4..de4064f19f 100644 --- a/modules/examples/src/order_management/index.ts +++ b/modules/examples/src/order_management/index.ts @@ -6,7 +6,6 @@ import { Directive, View, Host, - NgValidator, forwardRef, Binding, EventEmitter diff --git a/modules/examples/src/person_management/index.ts b/modules/examples/src/person_management/index.ts index a176954ed6..8ce2e3e6d1 100644 --- a/modules/examples/src/person_management/index.ts +++ b/modules/examples/src/person_management/index.ts @@ -6,7 +6,6 @@ import { Directive, View, Host, - NgValidator, forwardRef, Binding } from 'angular2/bootstrap'; diff --git a/modules/examples/src/template_driven_forms/index.ts b/modules/examples/src/template_driven_forms/index.ts index 8aa07847cd..13498a479a 100644 --- a/modules/examples/src/template_driven_forms/index.ts +++ b/modules/examples/src/template_driven_forms/index.ts @@ -6,7 +6,7 @@ import { Directive, View, Host, - NgValidator, + NG_VALIDATORS, forwardRef, Binding } from 'angular2/bootstrap'; @@ -32,20 +32,19 @@ class CheckoutModel { /** * Custom validator. */ +function creditCardValidator(c): StringMap { + if (isPresent(c.value) && RegExpWrapper.test(new RegExp("^\\d{16}$"), c.value)) { + return null; + } else { + return {"invalidCreditCard": true}; + } +} + const creditCardValidatorBinding = - CONST_EXPR(new Binding(NgValidator, {toAlias: forwardRef(() => CreditCardValidator)})); + CONST_EXPR(new Binding(NG_VALIDATORS, {toValue: creditCardValidator, multi: true})); @Directive({selector: '[credit-card]', bindings: [creditCardValidatorBinding]}) class CreditCardValidator { - get validator() { return CreditCardValidator.validate; } - - static validate(c): StringMap { - if (isPresent(c.value) && RegExpWrapper.test(new RegExp("^\\d{16}$"), c.value)) { - return null; - } else { - return {"invalidCreditCard": true}; - } - } } /**