Skip to content

Commit

Permalink
release v3.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jacky.yyy committed Feb 15, 2017
1 parent 7461165 commit 55dd850
Show file tree
Hide file tree
Showing 130 changed files with 1,658 additions and 1,248 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ typings/
node_modules/
dist/
.DS_Store
aot/
aot/
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ re-trigger validate when validate-property change
# v3.6.0

Improved US Phone Number formats
detail see https://github.com/yuyang041060120/ng2-validation/pull/43/
detail see https://github.com/yuyang041060120/ng2-validation/pull/43/

#v3.7.0

code split
3 changes: 2 additions & 1 deletion example/src/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { CustomValidators } from '../../src';

@Component({
selector: 'app',
template: require('./app.html')
template: require('./app.html'),
styles: [require('./app.less')]
})
export class AppComponent implements OnInit {
form: FormGroup;
Expand Down
320 changes: 248 additions & 72 deletions example/src/app.html
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,248 @@
<form #demoForm="ngForm" novalidate>
<!--<h4>rangeLength</h4>-->
<!--<input type="text" ngModel name="username" #username="ngModel" [rangeLength]="[5, 9]"/>-->
<!--<p *ngIf="username?.errors?.rangeLength">rangeLength error</p>-->

<h4>min</h4>
<input type="text" ngModel name="min" #min="ngModel" [min]="num"/>
<p *ngIf="min?.errors?.min">min error</p>

<h4>max</h4>
<input type="text" ngModel name="max" #max="ngModel" [max]="num"/>
<p *ngIf="max?.errors?.max">max error</p>

<h4>equal to "xxx"</h4>
<input type="text" ngModel name="equal" #equal="ngModel" [equal]="'' + num"/>
<p *ngIf="equal?.errors?.equal">equal error</p>

<h4>minDate</h4>
<input type="text" ngModel name="minDate" #minDate="ngModel" minDate="2016-09-09"/>
<p *ngIf="minDate?.errors?.minDate">minDate error</p>

<button (click)="num = 6">click {{num}}</button>

<!--<h4>range</h4>-->
<!--<input type="text" ngModel name="range" #range="ngModel" [range]="[5, 9]"/>-->
<!--<p *ngIf="range?.errors?.range">range error</p>-->

<!--<h4>creditCard</h4>-->
<!--<input type="text" ngModel name="creditCard" #creditCard="ngModel" creditCard/>-->
<!--<p *ngIf="creditCard?.errors?.creditCard">creditCard error</p>-->

<!--<h4>JSON</h4>-->
<!--<input type="text" ngModel name="json" #json="ngModel" json/>-->
<!--<p *ngIf="json?.errors?.json">JSON error</p>-->

<!--<h4>base64</h4>-->
<!--<input type="text" ngModel name="base" #base="ngModel" base64/>-->
<!--<p *ngIf="base?.errors?.base64">base64 error</p>-->

<!--<h4>phone</h4>-->
<!--<input type="text" ngModel name="phone" #phone="ngModel" [phone]="'zh-CN'"/>-->
<!--<p *ngIf="phone?.errors?.phone">phone error</p>-->

<!--<h4>UUID</h4>-->
<!--<input type="text" ngModel name="uuid" #uuid="ngModel" [uuid]="4"/>-->
<!--<p *ngIf="uuid?.errors?.uuid">UUID error</p>-->

<!--<h4>equal to "xxx"</h4>-->
<!--<input type="text" ngModel name="equal" #equal="ngModel" [equal]="'xxx'"/>-->
<!--<p *ngIf="equal?.errors?.equal">equal error</p>-->

<!--<h4>equalTo to password</h4>-->
<!--<input type="password" ngModel name="password" #password="ngModel" required/>-->
<!--<p *ngIf="password?.errors?.required">required error</p>-->
<!--<input type="password" ngModel name="certainPassword" #certainPassword="ngModel" [equalTo]="password"/>-->
<!--<p *ngIf="certainPassword?.errors?.equalTo">equalTo error</p>-->

</form>

<!--<form [formGroup]="form">-->
<!--<input type="password" formControlName="password"/>-->
<!--<p *ngIf="form.controls.password.errors?.required">required error</p>-->
<!--<input type="password" formControlName="certainPassword"/>-->
<!--<p *ngIf="form.controls.certainPassword.errors?.equalTo">equalTo error</p>-->
<!--</form>-->

<form [formGroup]="form">
<input type="password" formControlName="password"/>
<p *ngIf="form.controls.password.errors?.required">required error</p>
<input type="password" formControlName="certainPassword"/>
<p *ngIf="form.controls.certainPassword.errors?.notEqualTo">notEqualTo error</p>
</form>
<div class="container">
<form class="form-horizontal" novalidate>
<div class="form-group">
<label class="col-xs-3 control-label">required</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="requried" #requried="ngModel" required/>
<p class="alert alert-danger" *ngIf="requried?.errors?.required">required error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">minlength</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="minlength" #minlength="ngModel" minlength="5"/>
<p class="alert alert-danger" *ngIf="minlength?.errors?.minlength">minlength error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">maxlength</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="maxlength" #maxlength="ngModel" maxlength="5"/>
<p class="alert alert-danger" *ngIf="maxlength?.errors?.maxlength">maxlength error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">pattern</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="pattern" #pattern="ngModel" pattern="[a-z]{6}"/>
<p class="alert alert-danger" *ngIf="pattern?.errors?.pattern">pattern error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">base64</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="base64" #base64="ngModel" base64/>
<p class="alert alert-danger" *ngIf="base64?.errors?.base64">base64 error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">creditCard</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="creditCard" #creditCard="ngModel" creditCard/>
<p class="alert alert-danger" *ngIf="creditCard?.errors?.creditCard">creditCard error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">date</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="date" #date="ngModel" date/>
<p class="alert alert-danger" *ngIf="date?.errors?.date">date error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">dateISO</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="dateISO" #dateISO="ngModel" dateISO/>
<p class="alert alert-danger" *ngIf="dateISO?.errors?.dateISO">dateISO error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">maxDate</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="maxDate" #maxDate="ngModel" maxDate="2016-12-12"/>
<p class="alert alert-danger" *ngIf="maxDate?.errors?.maxDate">maxDate error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">minDate</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="minDate" #minDate="ngModel" minDate="2016-12-12"/>
<p class="alert alert-danger" *ngIf="minDate?.errors?.minDate">minDate error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">digits</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="digits" #digits="ngModel" digits/>
<p class="alert alert-danger" *ngIf="digits?.errors?.digits">digits error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">email</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="email" #email="ngModel" email/>
<p class="alert alert-danger" *ngIf="email?.errors?.email">email error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">equal</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="equal" #equal="ngModel" equal="aabbcc"/>
<p class="alert alert-danger" *ngIf="equal?.errors?.equal">equal error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">notEqual</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="notEqual" #notEqual="ngModel" notEqual="aabbcc"/>
<p class="alert alert-danger" *ngIf="notEqual?.errors?.notEqual">notEqual error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">equalTo</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="password" #password="ngModel"/>
<input class="form-control" type="text" ngModel name="equalTo" #equalTo="ngModel" [equalTo]="password"/>
<p class="alert alert-danger" *ngIf="equalTo?.errors?.equalTo">equalTo error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">notEqualTo</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="oldPassword" #oldPassword="ngModel"/>
<input class="form-control" type="text" ngModel name="notEqualTo" #notEqualTo="ngModel" [notEqualTo]="oldPassword"/>
<p class="alert alert-danger" *ngIf="notEqualTo?.errors?.notEqualTo">notEqualTo error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">greater than</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="gt" #gt="ngModel" gt="10"/>
<p class="alert alert-danger" *ngIf="gt?.errors?.gt">greater than error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">less than</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="lt" #lt="ngModel" lt="5"/>
<p class="alert alert-danger" *ngIf="lt?.errors?.lt">less than error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">json</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="json" #json="ngModel" json/>
<p class="alert alert-danger" *ngIf="json?.errors?.json">json error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">max</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="max" #max="ngModel" max="5"/>
<p class="alert alert-danger" *ngIf="max?.errors?.max">max error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">min</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="min" #min="ngModel" min="5"/>
<p class="alert alert-danger" *ngIf="min?.errors?.min">min error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">number</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="number" #number="ngModel" number/>
<p class="alert alert-danger" *ngIf="number?.errors?.number">number error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">phone</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="phone" #phone="ngModel" phone/>
<p class="alert alert-danger" *ngIf="phone?.errors?.phone">phone error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">range</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="range" #range="ngModel" [range]="[4,9]"/>
<p class="alert alert-danger" *ngIf="range?.errors?.range">range error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">rangeLength</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="rangeLength" #rangeLength="ngModel" [rangeLength]="[4,9]"/>
<p class="alert alert-danger" *ngIf="rangeLength?.errors?.rangeLength">rangeLength error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">url</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="url" #url="ngModel" url/>
<p class="alert alert-danger" *ngIf="url?.errors?.url">url error</p>
</div>
</div>

<div class="form-group">
<label class="col-xs-3 control-label">uuid</label>

<div class="col-xs-9">
<input class="form-control" type="text" ngModel name="uuid" #uuid="ngModel" uuid="3"/>
<p class="alert alert-danger" *ngIf="uuid?.errors?.uuid">uuid error</p>
</div>
</div>
</form>
</div>
11 changes: 11 additions & 0 deletions example/src/app.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@import "~bootstrap/less/bootstrap";

.container {
margin-top: 50px;
margin-bottom: 50px;
width: 600px;
}

.alert {
padding: 5px;
}
6 changes: 3 additions & 3 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</head>
<body>
<app></app>
<script src="/dist/polyfills.js"></script>
<script src="/dist/vendor.js"></script>
<script src="/dist/bundle.js"></script>
<script src="/ng2-validation/example/dist/polyfills.js"></script>
<script src="/ng2-validation/example/dist/vendor.js"></script>
<script src="/ng2-validation/example/dist/bundle.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion karma-test-shim.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require('zone.js/dist/sync-test');
require('zone.js/dist/proxy');
require('zone.js/dist/jasmine-patch');

var appContext = require.context('./src/specs', true, /\.spec\.ts/);
var appContext = require.context('./src', true, /\.spec\.ts/);

appContext.keys().forEach(appContext);

Expand Down
Loading

0 comments on commit 55dd850

Please sign in to comment.