Skip to content
This repository was archived by the owner on Jul 1, 2020. It is now read-only.

Commit 113eb95

Browse files
ghiscodingghiscoding
committed
Tested with AngularJS 1.4.x branch & fixed #55
- Made sure Angular-Validation works with AngularJS 1.4.x branch, updated my Rev to 1.4.x branch as well - Also fixed issue #55, ui bootsrap datepicker and angular-validation
1 parent f0504cd commit 113eb95

File tree

13 files changed

+171
-39
lines changed

13 files changed

+171
-39
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-validation-ghiscoding",
3-
"version": "1.3.39",
3+
"version": "1.4.0",
44
"author": "Ghislain B.",
55
"description": "Angular-Validation Directive and Service (ghiscoding)",
66
"main": [

‎changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Angular-Validation change logs
22

3+
1.4.0 (2015-08-06) Tested with AngularJS 1.4.x branch. Also fixed issue #55 - ui bootsrap datepicker and angular-validation.
34
1.3.39 (2015-07-28) Fixed issue #54 - display alt text as HTML instead of escaped text, changed from `.text()` to `.html()`
45
1.3.38 (2015-07-28) Fixed issue #52 - Changed default behavior of `ngDisabled` which was displaying error message right after an element became enabled, it will still pre-validate but not directly show the error message unless `preValidateFormElements` is set to True. Fixed issue #53 - To support `ngIf` (add a trigger on element `$destroy`).
56
1.3.37 (2015-07-21) Fixed a small IE8 problem with "catch" being a reserved word.

‎dist/angular-validation.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎full-tests/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ <h1>Angular-Validation Directive|Service (ghiscoding)</h1>
3535
<ng-view></ng-view>
3636

3737
<!-- external librairies CDN -->
38-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
39-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script>
38+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js"></script>
39+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-route.js"></script>
4040

4141
<!-- angular-translate -->
4242
<!-- Visit Angular-Translate https://github.com/PascalPrecht/angular-translate -->

‎index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ <h1>Angular-Validation Directive|Service (ghiscoding)</h1>
3939
<ng-view></ng-view>
4040

4141
<!-- external librairies CDN -->
42-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
43-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script>
42+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js"></script>
43+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-route.js"></script>
4444

4545
<!-- angular-translate -->
4646
<!-- Visit Angular-Translate https://github.com/PascalPrecht/angular-translate -->

‎more-examples/angular-ui-calendar/app.js

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
'use strict';
2+
3+
var myApp = angular.module('myApp', ['ghiscoding.validation', 'pascalprecht.translate', 'ui.bootstrap']);
4+
5+
myApp.config(['$compileProvider', function ($compileProvider) {
6+
$compileProvider.debugInfoEnabled(false);
7+
}])
8+
.config(['$translateProvider', function ($translateProvider) {
9+
$translateProvider.useStaticFilesLoader({
10+
prefix: '../../locales/validation/',
11+
suffix: '.json'
12+
});
13+
// load English ('en') table on startup
14+
$translateProvider.preferredLanguage('en').fallbackLanguage('en');
15+
}]);
16+
17+
myApp.controller('Ctrl',
18+
['$scope', '$translate', 'validationService', '$timeout',
19+
function ($scope, $translate, validationService, $timeout) {
20+
var vm = this;
21+
vm.model = {};
22+
vm.validationRequired = false;
23+
vm.isChangeDatePickerOpen = false;
24+
vm.datePickerFormat = 'dd/MM/yyyy';
25+
vm.dateOptions = { formatYear: 'yy' };
26+
27+
vm.minDate = new Date(); // 10 years ago
28+
vm.minDate.setHours(0,0,0,0);
29+
vm.minDate.setMonth(vm.minDate.getMonth() - 12 * 10);
30+
vm.maxDate = new Date(); // now
31+
vm.maxDate.setHours(0,0,0,0);
32+
33+
this.openDatePicker = function($event) {
34+
console.log("openDatePicker()", vm.isChangeDatePickerOpen);
35+
$event.preventDefault();
36+
$event.stopPropagation();
37+
vm.isChangeDatePickerOpen = true;
38+
};
39+
40+
var validation = new validationService({
41+
controllerAs: vm,
42+
preValidateFormElements: false
43+
});
44+
45+
vm.checkboxChange = function() {
46+
validation.checkFormValidity(vm.test); // force validation
47+
}
48+
}]);

‎more-examples/angular-ui-calendar/index.html

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<!DOCTYPE html>
2+
<html ng-app="myApp" ng-strict-di ng-cloak="">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Angular-Validation Example with Interpolation</title>
6+
<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
7+
<link rel="stylesheet" href="../../style.css">
8+
</head>
9+
10+
<body ng-controller="Ctrl as vm">
11+
<div class="container">
12+
<h2>Example of Angular-Validation Date validation error after select from ui datepicker.</h2>
13+
<hr/>
14+
<label class="control-label">Min Date {{vm.minDate}}</label>
15+
<label class="control-label">Max Date {{vm.maxDate}}</label>
16+
<hr/>
17+
<form name="vm.test">
18+
<label class="control-label">Date</label>
19+
<div class="input-group">
20+
<input
21+
type="text"
22+
id="dateOfChange"
23+
name="dateOfChange"
24+
class="form-control"
25+
validation="required|date_euro_long_between:{{vm.minDate | date:'dd/MM/yyyy'}},{{vm.maxDate | date:'dd/MM/yyyy'}}"
26+
validation-error-to="dateOfChangeValidation"
27+
ng-model="vm.model.dateOfChange"
28+
datepicker-popup="{{vm.datePickerFormat}}"
29+
datepicker-options="vm.dateOptions"
30+
datepicker-mode="'day'"
31+
is-open="vm.isChangeDatePickerOpen"
32+
min-date="vm.minDate"
33+
max-date="vm.maxDate"
34+
/>
35+
<span class="input-group-btn">
36+
<button type="button" class="btn btn-default"
37+
data-ng-click="vm.openDatePicker($event)">
38+
<i class="glyphicon glyphicon-calendar"></i>
39+
</button>
40+
</span>
41+
</div>
42+
<div id="dateOfChangeValidation" class="validation text-danger"></div>
43+
</form>
44+
45+
46+
<br/>
47+
<br/>
48+
<div class="alert alert-danger alert-dismissable" ng-show="vm.test.$validationSummary.length &gt; 0">
49+
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
50+
<h4><strong>ERRORS!</strong></h4>
51+
<ul>
52+
<li ng-repeat="item in vm.test.$validationSummary">{{ item.friendlyName != '' ? item.friendlyName : item.field }}: {{item.message}}</li>
53+
</ul>
54+
</div>
55+
56+
<ng-view></ng-view>
57+
</div>
58+
59+
<!-- external librairies CDN -->
60+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js"></script>
61+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-route.js"></script>
62+
63+
<!-- angular-translate -->
64+
<!-- Visit Angular-Translate https://github.com/PascalPrecht/angular-translate -->
65+
<script src="../../vendors/angular-translate/angular-translate.min.js"></script>
66+
<script src="../../vendors/angular-translate/angular-translate-loader-static-files.min.js"></script>
67+
68+
<!-- Angular-UI -->
69+
<script src="https://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.13.2.js"></script>
70+
71+
<!-- Angular-Validation -->
72+
<script type="text/javascript" src="../../dist/angular-validation.min.js"></script>
73+
<!--
74+
<script type="text/javascript" src="../../src/validation-directive.js"></script>
75+
<script type="text/javascript" src="../../src/validation-service.js"></script>
76+
<script type="text/javascript" src="../../src/validation-common.js"></script>
77+
<script type="text/javascript" src="../../src/validation-rules.js"></script>
78+
-->
79+
80+
<!-- my application -->
81+
<script type="text/javascript" src="app.js"></script>
82+
</body>
83+
</html>

‎more-examples/dynamic-form/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ <h4>Forms are Valid after Submit</h4>
4141
</div>
4242

4343
<!-- external librairies CDN -->
44-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
45-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script>
44+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js"></script>
45+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-route.js"></script>
4646
<script type="text/javascript" src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.12.1.js"></script>
4747

4848
<!-- angular-translate -->

‎more-examples/dynamic-input/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ <h3 class="text-info">{{'CHANGE_LANGUAGE' | translate}}</h3>
2323
</div>
2424

2525
<!-- external librairies CDN -->
26-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
27-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script>
26+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js"></script>
27+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-route.js"></script>
2828

2929
<!-- angular-translate -->
3030
<!-- Visit Angular-Translate https://github.com/PascalPrecht/angular-translate -->

‎more-examples/interpolateValidation/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ <h4><strong>ERRORS!</strong></h4>
5656
</div>
5757

5858
<!-- external librairies CDN -->
59-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
60-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script>
59+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js"></script>
60+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-route.js"></script>
6161

6262
<!-- angular-translate -->
6363
<!-- Visit Angular-Translate https://github.com/PascalPrecht/angular-translate -->

0 commit comments

Comments
 (0)