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

Commit 0a30a10

Browse files
ghiscodingghiscoding
committed
Fixed issue #58 - multiple ControllerAs with Route
1 parent 5bec940 commit 0a30a10

File tree

21 files changed

+417
-76
lines changed

21 files changed

+417
-76
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.4.2",
3+
"version": "1.4.3",
44
"author": "Ghislain B.",
55
"description": "Angular-Validation Directive and Service (ghiscoding)",
66
"main": [

‎changelog.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Angular-Validation change logs
22

3-
1.4.2 (2015-08-09) Fixed Bootstrap UI interference with Angular-Validation, in relation to issue #55.
3+
1.4.3 (2015-08-18) Fixed issue #58 - multiple ControllerAs with Route change giving error of 'undefined' on $validationSummary.
4+
1.4.2 (2015-08-09) Fixed Bootstrap UI (or any other tool) interference with Angular-Validation, in relation to issue #55.
45
1.4.1 (2015-08-09) Fixed issue #56 - TextArea validation problem with ENTER key (newline).
56
1.4.0 (2015-08-06) Tested with AngularJS 1.4.x branch. Also fixed issue #55 - ui bootsrap datepicker and angular-validation.
67
1.3.39 (2015-07-28) Fixed issue #54 - display alt text as HTML instead of escaped text, changed from `.text()` to `.html()`

‎dist/angular-validation.min.js‎

Lines changed: 5 additions & 5 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.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>
38+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.js"></script>
39+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/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.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>
42+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.js"></script>
43+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-route.js"></script>
4444

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

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

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

5959
<!-- 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>
60+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.js"></script>
61+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-route.js"></script>
6262

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

‎more-examples/controllerAsWithRoute/app.js‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
var myApp = angular.module('myApp', ['ngRoute', 'ghiscoding.validation', 'pascalprecht.translate']);
4+
5+
myApp.config(['$compileProvider', function ($compileProvider) {
6+
$compileProvider.debugInfoEnabled(false);
7+
}])
8+
.config(['$routeProvider', '$translateProvider', function ($routeProvider, $translateProvider) {
9+
$translateProvider.useStaticFilesLoader({
10+
prefix: '../../locales/validation/',
11+
suffix: '.json'
12+
});
13+
14+
// load English ('en') table on startup
15+
$translateProvider.preferredLanguage('en').fallbackLanguage('en');
16+
17+
$routeProvider
18+
.when('/First', {
19+
template: '<div>First Content</div>'
20+
+'<form name="vm.firstForm">'
21+
+'<input name="firstField" ng-model="vm.model.firstField" validation="required">'
22+
+'</form>'
23+
+'<div class="col-xs-12 alert alert-danger alert-dismissable" ng-show="vm.firstForm.$validationSummary.length > 0">'
24+
+'<ul>'
25+
+'<li ng-repeat="item in vm.firstForm.$validationSummary">{{ item.field }}: {{item.message}}</li>'
26+
+'</ul>'
27+
+'</div>',
28+
controller: 'FirstCtrl',
29+
controllerAs: 'vm'
30+
})
31+
.when('/Second', {
32+
template: '<div>Second Content</div>'
33+
+'<form name="vm.secondForm">'
34+
+'<input name="secondField" ng-model="vm.model.secondField" validation="required">'
35+
+'</form>'
36+
+'<div class="col-xs-12 alert alert-danger alert-dismissable" ng-show="vm.secondForm.$validationSummary.length > 0">'
37+
+'<ul>'
38+
+'<li ng-repeat="item in vm.secondForm.$validationSummary">{{ item.field }}: {{item.message}}</li>'
39+
+'</ul>'
40+
+'</div>',
41+
controller: 'SecondCtrl',
42+
controllerAs: 'vm'
43+
})
44+
.otherwise({ redirectTo: '/First' });
45+
}]);
46+
47+
myApp.controller('Ctrl', [
48+
'validationService',
49+
function (validationService) {
50+
var vm = this;
51+
vm.model = {};
52+
var v1 = new validationService({ controllerAs: vm, resetGlobalOptionsOnRouteChange: false });
53+
}]);
54+
55+
myApp.controller('FirstCtrl', [
56+
'validationService',
57+
function (validationService) {
58+
var vm = this;
59+
vm.model = {};
60+
var v2 = new validationService({ controllerAs: vm });
61+
}
62+
]);
63+
64+
myApp.controller('SecondCtrl', [
65+
'validationService',
66+
function (validationService) {
67+
var vm = this;
68+
vm.model = {};
69+
var v3 = new validationService({ controllerAs: vm });
70+
}
71+
]);

‎more-examples/controllerAsWithRoute/index.html‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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 vmA">
11+
<div class="container-fluid">
12+
<h2>Angular-Validation with Routes Getting an error typing a char in Field1.</h2>
13+
14+
<div class="row">
15+
<div class="col-xs-12 alert alert-danger alert-dismissable"
16+
ng-show="vmA.test.$validationSummary.length > 0">
17+
<button type="button" class="close"
18+
data-dismiss="alert" aria-hidden="true">&times;</button>
19+
<h4><strong>ERRORS!</strong></h4>
20+
<ul>
21+
<li ng-repeat="item in vmA.test.$validationSummary">{{ item.field }}: {{item.message}}</li>
22+
</ul>
23+
</div>
24+
</div>
25+
26+
vmA.model.f1 [[{{vmA.model.f1}}]]
27+
<form name="vmA.test">
28+
<div class="row">
29+
<label class="col-xs-2 control-label">Field1</label>
30+
<div class="col-xs-6">
31+
<input id="f1" class="form-control" type="text" name="f1"
32+
ng-model="vmA.model.f1"
33+
validation="required" />
34+
</div>
35+
</div>
36+
</form>
37+
38+
<hr/>
39+
40+
<div class="row">
41+
<div class="col-xs-6">
42+
Choose Route: [<a name="first_route" href="#/First">First</a>]
43+
&nbsp;[<a name="second_route" href="#/Second">Second</a>]
44+
</div>
45+
</div>
46+
<div class="row">
47+
<div class="col-xs-6">
48+
<h4>A View</h4>
49+
<ng-view></ng-view>
50+
</div>
51+
</div>
52+
53+
</div>
54+
55+
<!-- external librairies CDN -->
56+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.js"></script>
57+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-route.js"></script>
58+
59+
<!-- angular-translate -->
60+
<!-- Visit Angular-Translate https://github.com/PascalPrecht/angular-translate -->
61+
<script src="../../vendors/angular-translate/angular-translate.min.js"></script>
62+
<script src="../../vendors/angular-translate/angular-translate-loader-static-files.min.js"></script>
63+
64+
<!-- Angular-UI -->
65+
<script src="https://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.13.2.js"></script>
66+
67+
<!-- Angular-Validation -->
68+
<script type="text/javascript" src="../../dist/angular-validation.min.js"></script>
69+
<!--
70+
<script type="text/javascript" src="../../src/validation-directive.js"></script>
71+
<script type="text/javascript" src="../../src/validation-service.js"></script>
72+
<script type="text/javascript" src="../../src/validation-common.js"></script>
73+
<script type="text/javascript" src="../../src/validation-rules.js"></script>
74+
-->
75+
76+
<!-- my application -->
77+
<script type="text/javascript" src="app.js"></script>
78+
</body>
79+
</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.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>
44+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.js"></script>
45+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/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.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>
26+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.js"></script>
27+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-route.js"></script>
2828

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

0 commit comments

Comments
 (0)