Skip to content

Commit 22f6e78

Browse files
committed
Issue Jakobovski#111: Adjusted the demo to use angular-messages
1 parent 9661af9 commit 22f6e78

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
"dependencies": {
3333
"angular": ">=1.3.0",
3434
"jquery": "~2.1.4"
35-
3635
},
3736
"devDependencies": {
38-
"angular-mocks": "~1.4.1"
37+
"angular-mocks": "~1.4.1",
38+
"angular-messages": "^1.6.2"
3939
},
4040
"homepage": "https://github.com/turinggroup/angular-validator"
4141
}

demo/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('angular-validator-demo', ['angularValidator']);
1+
angular.module('angular-validator-demo', ['angularValidator', 'ngMessages']);
22

33

44
angular.module('angular-validator-demo').controller('DemoCtrl', function($scope) {

demo/index.html

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ <h4>Field invalid message hides form invalid message</h4>
178178
</form>
179179

180180
<form angular-validator-submit="submitMyForm()" name="myForm3" class="form-horizontal" novalidate angular-validator >
181-
<h4>Using Field angular-validator-quiet</h4>
181+
<h4>Using Field angular-validator-quiet (with angular-messages)</h4>
182182
<div class="form-group">
183183
<label class="col-sm-2 control-label">Field 1 max length 5</label>
184184
<div class="col-sm-10">
@@ -189,9 +189,9 @@ <h4>Using Field angular-validator-quiet</h4>
189189
ng-maxlength="5"
190190
required
191191
angular-validator-quiet></div>
192-
<div class="col-sm-12" ng-if="myForm3.submitted" ng-cloak="">
193-
<div class="alert alert-danger" ng-if="myForm3.form3input.$error.required">"Required" message with manual template</div>
194-
<div class="alert alert-danger" ng-if="myForm3.form3input.$error.maxlength">"Max Length" message with manual template</div>
192+
<div class="col-sm-12" ng-messages="myForm3.form3input.$error" ng-if="myForm3.submitted" ng-cloak="">
193+
<div class="alert alert-danger" ng-message="required">"Required" message with manual template</div>
194+
<div class="alert alert-danger" ng-message="maxlength">"Max Length" message with manual template</div>
195195
</div>
196196
</div>
197197
<div class="form-group">
@@ -215,7 +215,7 @@ <h4>Using Field angular-validator-quiet</h4>
215215
</form>
216216

217217
<form angular-validator-submit="submitMyForm()" name="myForm4" class="form-horizontal" novalidate angular-validator angular-validator-quiet>
218-
<h4>Using Form angular-validator-quiet</h4>
218+
<h4>Using Form angular-validator-quiet (with angular-messages)</h4>
219219
<div class="form-group">
220220
<label class="col-sm-2 control-label">Field 1 max length 5</label>
221221
<div class="col-sm-10">
@@ -225,9 +225,9 @@ <h4>Using Form angular-validator-quiet</h4>
225225
ng-model="form4input"
226226
ng-maxlength="5"
227227
required></div>
228-
<div class="col-sm-12" ng-if="myForm4.submitted" ng-cloak="">
229-
<div class="alert alert-danger" ng-if="myForm4.form4input.$error.required">"Required" message with manual template</div>
230-
<div class="alert alert-danger" ng-if="myForm4.form4input.$error.maxlength">"Max Length" message with manual template</div>
228+
<div class="col-sm-12" ng-if="myForm4.submitted" ng-messages="myForm4.form4input.$error" ng-cloak="">
229+
<div class="alert alert-danger" ng-message="required">"Required" message with manual template</div>
230+
<div class="alert alert-danger" ng-message="maxlength">"Max Length" message with manual template</div>
231231
</div>
232232
</div>
233233
<div class="form-group">
@@ -239,9 +239,9 @@ <h4>Using Form angular-validator-quiet</h4>
239239
ng-model="form4input2"
240240
ng-maxlength="5"
241241
required></div>
242-
<div class="col-sm-12" ng-if="myForm4.submitted" ng-cloak="">
243-
<div class="alert alert-danger" ng-if="myForm4.form4input2.$error.required">"Required" message with manual template</div>
244-
<div class="alert alert-danger" ng-if="myForm4.form4input2.$error.maxlength">"Max Length" message with manual template</div>
242+
<div class="col-sm-12" ng-if="myForm4.submitted" ng-messages="myForm4.form4input2.$error" ng-cloak="">
243+
<div class="alert alert-danger" ng-message="required">"Required" message with manual template</div>
244+
<div class="alert alert-danger" ng-message="maxlength">"Max Length" message with manual template</div>
245245
</div>
246246
</div>
247247
<hr>
@@ -267,6 +267,7 @@ <h4> <u>Scope Sneak Peak</u>
267267
</div>
268268
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular.min.js"></script>
269269
<script src="app.js"></script>
270+
<script src="/bower_components/angular-messages/angular-messages.js"></script>
270271
<script src="../dist/angular-validator.js"></script>
271272

272273
</body>

0 commit comments

Comments
 (0)