Merge branch 'master' into master

CHANGELOG.md

@@ -0,0 +1,7 @@
+# v3.4.0
+
+add lt and gt validator
+
+# v3.5.0
+
+re-trigger validate when validate-property change

README.md

@@ -21,7 +21,9 @@ npm install ng2-validation --save
 
 - rangeLength
 - min
+- gt
 - max
+- lt
 - range
 - digits
 - number
@@ -77,13 +79,27 @@ export class AppModule {
 <p *ngIf="field.errors?.min">error message</p>
 ```
 
+### gt
+
+```html
+<input type="number" [(ngModel)]="model.field" name="field" #field="ngModel" [gt]="10"/>
+<p *ngIf="field.errors?.gt">error message</p>
+```
+
 ### max
 
 ```html
 <input type="number" [(ngModel)]="model.field" name="field" #field="ngModel" [max]="20"/>
 <p *ngIf="field.errors?.max">error message</p>
 ```
 
+### lt
+
+```html
+<input type="number" [(ngModel)]="model.field" name="field" #field="ngModel" [lt]="20"/>
+<p *ngIf="field.errors?.lt">error message</p>
+```
+
 ### range
 
 ```html
@@ -301,12 +317,24 @@ new FormControl('', CustomValidators.rangeLength([5, 9]))
 new FormControl('', CustomValidators.min(10))
 ```
 
+### gt
+
+```javascript
+new FormControl('', CustomValidators.gt(10))
+```
+
 ### max
 
 ```javascript
 new FormControl('', CustomValidators.max(20))
 ```
 
+### lt
+
+```javascript
+new FormControl('', CustomValidators.lt(20))
+```
+
 ### range
 
 ```javascript

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng2-validation",
-  "version": "3.3.0",
+  "version": "3.6.1",
   "description": "angular2 validation",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

src/custom-validators.ts

@@ -39,6 +39,30 @@ export class CustomValidators {
     };
   }
 
+  /**
+   * Validator that requires controls to have a value greater than a gt value.
+   */
+  static gt(gt: number): ValidatorFn {
+    return (control: AbstractControl): {[key: string]: any} => {
+      if (isPresent(Validators.required(control))) return null;
+
+      let v: number = control.value;
+      return v > gt ? null : {'gt': true};
+    };
+  }
+
+  /**
+   * Validator that requires controls to have a value less than a lt value.
+   */
+  static lt(lt: number): ValidatorFn {
+    return (control: AbstractControl): {[key: string]: any} => {
+      if (isPresent(Validators.required(control))) return null;
+
+      let v: number = control.value;
+      return v < lt ? null : {'lt': true};
+    };
+  }
+
   /**
    * Validator that requires controls to have a value of a range value.
    */

src/directives.ts

@@ -2,7 +2,9 @@ import { NgModule, Directive } from '@angular/core';
 
 import { RangeLengthValidator } from './directives/range-length';
 import { MinValidator } from './directives/min';
+import { GreaterThanValidator } from './directives/greater-than';
 import { MaxValidator } from './directives/max';
+import { LessThanValidator } from './directives/less-than';
 import { RangeValidator } from './directives/range';
 import { DigitsValidator } from './directives/digits';
 import { NumberValidator } from './directives/number';
@@ -24,7 +26,9 @@ import { NotEqualToValidator } from './directives/not-equal-to';
 export const CUSTOM_FORM_DIRECTIVES: Directive[] = [
   RangeLengthValidator,
   MinValidator,
+  GreaterThanValidator,
   MaxValidator,
+  LessThanValidator,
   RangeValidator,
   DigitsValidator,
   NumberValidator,

src/directives/equal.ts

@@ -17,6 +17,7 @@ export class EqualValidator implements Validator, OnInit, OnChanges {
   @Input() equal: any;
 
   private validator: ValidatorFn;
+  private onChange: () => void;
 
   ngOnInit() {
     this.validator = CustomValidators.equal(this.equal);
@@ -26,11 +27,16 @@ export class EqualValidator implements Validator, OnInit, OnChanges {
     for (let key in changes) {
       if (key === 'equal') {
         this.validator = CustomValidators.equal(changes[key].currentValue);
+        if (this.onChange) this.onChange();
       }
     }
   }
 
   validate(c: AbstractControl): {[key: string]: any} {
     return this.validator(c);
   }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
 }

src/directives/greater-than.ts

@@ -0,0 +1,42 @@
+import { Directive, Input, forwardRef, OnInit, OnChanges, SimpleChanges } from '@angular/core';
+import { NG_VALIDATORS, Validator, ValidatorFn, AbstractControl } from '@angular/forms';
+
+import { CustomValidators } from '../index';
+
+const GREATER_THAN_VALIDATOR: any = {
+  provide: NG_VALIDATORS,
+  useExisting: forwardRef(() => GreaterThanValidator),
+  multi: true
+};
+
+@Directive({
+  selector: '[gt][formControlName],[gt][formControl],[gt][ngModel]',
+  providers: [GREATER_THAN_VALIDATOR]
+})
+export class GreaterThanValidator implements Validator, OnInit, OnChanges {
+  @Input() gt: number;
+
+  private validator: ValidatorFn;
+  private onChange: () => void;
+
+  ngOnInit() {
+    this.validator = CustomValidators.gt(this.gt);
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    for (let key in changes) {
+      if (key === 'gt') {
+        this.validator = CustomValidators.gt(changes[key].currentValue);
+        if (this.onChange) this.onChange();
+      }
+    }
+  }
+
+  validate(c: AbstractControl): {[key: string]: any} {
+    return this.validator(c);
+  }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
+}

src/directives/less-than.ts

@@ -0,0 +1,42 @@
+import { Directive, Input, forwardRef, OnInit, OnChanges, SimpleChanges } from '@angular/core';
+import { NG_VALIDATORS, Validator, ValidatorFn, AbstractControl } from '@angular/forms';
+
+import { CustomValidators } from '../index';
+
+const LESS_THAN_VALIDATOR: any = {
+  provide: NG_VALIDATORS,
+  useExisting: forwardRef(() => LessThanValidator),
+  multi: true
+};
+
+@Directive({
+  selector: '[lt][formControlName],[lt][formControl],[lt][ngModel]',
+  providers: [LESS_THAN_VALIDATOR]
+})
+export class LessThanValidator implements Validator, OnInit, OnChanges {
+  @Input() lt: number;
+
+  private validator: ValidatorFn;
+  private onChange: () => void;
+
+  ngOnInit() {
+    this.validator = CustomValidators.lt(this.lt);
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    for (let key in changes) {
+      if (key === 'lt') {
+        this.validator = CustomValidators.lt(changes[key].currentValue);
+        if (this.onChange) this.onChange();
+      }
+    }
+  }
+
+  validate(c: AbstractControl): {[key: string]: any} {
+    return this.validator(c);
+  }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
+}

src/directives/max-date.ts

@@ -17,6 +17,7 @@ export class MaxDateValidator implements Validator, OnInit, OnChanges {
   @Input() maxDate;
 
   private validator: ValidatorFn;
+  private onChange: () => void;
 
   ngOnInit() {
     this.validator = CustomValidators.maxDate(this.maxDate);
@@ -26,11 +27,16 @@ export class MaxDateValidator implements Validator, OnInit, OnChanges {
     for (let key in changes) {
       if (key === 'maxDate') {
         this.validator = CustomValidators.maxDate(changes[key].currentValue);
+        if (this.onChange) this.onChange();
       }
     }
   }
 
   validate(c: AbstractControl): {[key: string]: any} {
     return this.validator(c);
   }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
 }

src/directives/max.ts

@@ -17,6 +17,7 @@ export class MaxValidator implements Validator, OnInit, OnChanges {
   @Input() max: number;
 
   private validator: ValidatorFn;
+  private onChange: () => void;
 
   ngOnInit() {
     this.validator = CustomValidators.max(this.max);
@@ -26,11 +27,16 @@ export class MaxValidator implements Validator, OnInit, OnChanges {
     for (let key in changes) {
       if (key === 'max') {
         this.validator = CustomValidators.max(changes[key].currentValue);
+        if (this.onChange) this.onChange();
       }
     }
   }
 
   validate(c: AbstractControl): {[key: string]: any} {
     return this.validator(c);
   }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
 }

src/directives/min-date.ts

@@ -17,6 +17,7 @@ export class MinDateValidator implements Validator, OnInit, OnChanges {
   @Input() minDate;
 
   private validator: ValidatorFn;
+  private onChange: () => void;
 
   ngOnInit() {
     this.validator = CustomValidators.minDate(this.minDate);
@@ -26,11 +27,16 @@ export class MinDateValidator implements Validator, OnInit, OnChanges {
     for (let key in changes) {
       if (key === 'minDate') {
         this.validator = CustomValidators.minDate(changes[key].currentValue);
+        if (this.onChange) this.onChange();
       }
     }
   }
 
   validate(c: AbstractControl): {[key: string]: any} {
     return this.validator(c);
   }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
 }

src/directives/min.ts

@@ -17,6 +17,7 @@ export class MinValidator implements Validator, OnInit, OnChanges {
   @Input() min: number;
 
   private validator: ValidatorFn;
+  private onChange: () => void;
 
   ngOnInit() {
     this.validator = CustomValidators.min(this.min);
@@ -26,11 +27,16 @@ export class MinValidator implements Validator, OnInit, OnChanges {
     for (let key in changes) {
       if (key === 'min') {
         this.validator = CustomValidators.min(changes[key].currentValue);
+        if (this.onChange) this.onChange();
       }
     }
   }
 
   validate(c: AbstractControl): {[key: string]: any} {
     return this.validator(c);
   }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
 }

src/directives/phone.ts

@@ -17,6 +17,7 @@ export class PhoneValidator implements Validator, OnInit, OnChanges {
   @Input() phone: string;
 
   private validator: ValidatorFn;
+  private onChange: () => void;
 
   ngOnInit() {
     this.validator = CustomValidators.phone(this.phone);
@@ -26,11 +27,16 @@ export class PhoneValidator implements Validator, OnInit, OnChanges {
     for (let key in changes) {
       if (key === 'phone') {
         this.validator = CustomValidators.phone(changes[key].currentValue);
+        if (this.onChange) this.onChange();
       }
     }
   }
 
   validate(c: AbstractControl): {[key: string]: any} {
     return this.validator(c);
   }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
 }

src/directives/range-length.ts

@@ -17,6 +17,7 @@ export class RangeLengthValidator implements Validator, OnInit, OnChanges {
   @Input() rangeLength: [number];
 
   private validator: ValidatorFn;
+  private onChange: () => void;
 
   ngOnInit() {
     this.validator = CustomValidators.rangeLength(this.rangeLength);
@@ -26,11 +27,16 @@ export class RangeLengthValidator implements Validator, OnInit, OnChanges {
     for (let key in changes) {
       if (key === 'rangeLength') {
         this.validator = CustomValidators.rangeLength(changes[key].currentValue);
+        if (this.onChange) this.onChange();
       }
     }
   }
 
   validate(c: AbstractControl): {[key: string]: any} {
     return this.validator(c);
   }
+
+  registerOnValidatorChange(fn: () => void): void {
+    this.onChange = fn;
+  }
 }