Skip to content

Commit fe1486f

Browse files
nelsonomutonelsonomuto
committed
fixes #25, updating bower dependencies and other bugs
1 parent 69fd38f commit fe1486f

File tree

214 files changed

+23836
-1157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+23836
-1157
lines changed

‎app/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@
6767
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
6868
<script src="bower_components/angular-route/angular-route.js"></script>
6969
<script src="bower_components/angular-bootstrap/ui-bootstrap.js"></script>
70-
<script src="bower_components/angular-template-retriever/dist/angular-template-retriever.js"></script>
7170
<!-- endbuild -->
7271

7372
<!-- build:js({.tmp,app}) scripts/scripts.js -->
7473
<script src="scripts/JSOL/jsol.js"></script>
74+
<script src="scripts/services/templateretriever/templateRetriever.js"></script>
7575
<script src="scripts/directives/invalidinputformatter/invalidInputFormatter.js"></script>
7676
<script src="scripts/directives/customvalidation/customValidations.js"></script>
7777
<script src="scripts/directives/customvalidationtypes/customValidationTypes.js"></script>
78-
78+
7979
<script src="scripts/app.js"></script>
8080
<script src="scripts/controllers/main.js"></script>
8181
<!-- endbuild -->

‎app/scripts/directives/customvalidation/customValidations.js‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ angular_ui_form_validations = (function(){
1111
dynamicallyDefinedValidation = {
1212
customValidationAttribute: 'validationDynamicallyDefined',
1313
errorCount: 0,
14+
latestElement: null,
1415
_errorMessage: 'Field is invalid',
1516
_success: function () {},
1617
success: function () {
@@ -61,6 +62,7 @@ angular_ui_form_validations = (function(){
6162
.each(function(valid){
6263
if(valid === false){
6364
dynamicallyDefinedValidation.errorCount++;
65+
dynamicallyDefinedValidation.latestElement = element;
6466
return false;
6567
}
6668
return true;
@@ -83,7 +85,7 @@ angular_ui_form_validations = (function(){
8385
var isCurrentlyDisplayingAnErrorMessageInATemplate = false;
8486
Lazy(customTemplates)
8587
.each(function(template){
86-
if(template.parent().is(inputElement.parents('form'))){
88+
if(template.attr('templateUid') === inputElement.attr('templateUid')){
8789
isCurrentlyDisplayingAnErrorMessageInATemplate = true;
8890
currentlyDisplayedTemplate = template;
8991
return false;
@@ -200,7 +202,14 @@ angular_ui_form_validations = (function(){
200202

201203
addWatcherForDynamicallyDefinedValidations = function () {
202204
$scope.$watch(function(){ return dynamicallyDefinedValidation.errorCount; }, function () {
203-
errorMessageElement.html(dynamicallyDefinedValidation.errorMessage());
205+
if (dynamicallyDefinedValidation.errorCount === 0) {
206+
return;
207+
}
208+
var currentElementFieldName = errorMessageElement.attr('data-custom-field-name');
209+
var latestValidatedFieldName = dynamicallyDefinedValidation.latestElement.attr('name');
210+
if(latestValidatedFieldName === currentElementFieldName) {
211+
errorMessageElement.html(dynamicallyDefinedValidation.errorMessage());
212+
}
204213
});
205214
};
206215

@@ -209,12 +218,16 @@ angular_ui_form_validations = (function(){
209218
customErrorTemplate = angular.element(template);
210219
customErrorTemplate.html('');
211220
errorMessageToggled = function () {
221+
var templateUid = Math.random();
212222
if(errorMessageElement.css('display') === 'inline' || errorMessageElement.css('display') === 'block') {
213223
$log.log('error showing');
224+
$element.attr('templateUid', templateUid);
225+
customErrorTemplate.attr('templateUid', templateUid);
214226
errorMessageElement.wrap(customErrorTemplate);
215227
customTemplates.push(angular.element(errorMessageElement.parents()[0]));
216228
} else {
217229
$log.log('error NOT showing');
230+
$element.removeAttr('templateUid');
218231
if(errorMessageElement.parent().is('.' + customErrorTemplate.attr('class'))){
219232
errorMessageElement.unwrap(customErrorTemplate);
220233
}
@@ -410,9 +423,11 @@ angular_ui_form_validations = (function(){
410423

411424
ngModelController.$setValidity(formatterArgs.customValidationAttribute.toLowerCase(), isValid);
412425

426+
var status = isValid === true ? ' passed' : ' failed';
427+
413428
customValidationBroadcastArg = {
414429
isValid: isValid,
415-
validation: formatterArgs.customValidationAttribute,
430+
validation: $element.attr('id') + ' ' + formatterArgs.customValidationAttribute + status,
416431
model: model,
417432
controller: ngModelController,
418433
element: $element

‎bower.json‎

Lines changed: 79 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,81 @@
11
{
2-
"name": "angular-ui-form-validation",
3-
"version": "1.1.10",
4-
"main": "./dist/angular-ui-form-validation.js",
5-
"keywords": [
6-
"angular",
7-
"angular-validation",
8-
"angular-ui-form-validation",
9-
"angular-validator",
10-
"validation",
11-
"angularjs",
12-
"directive",
13-
"javascript",
14-
"nelson",
15-
"omuto",
16-
"angular validation directive",
17-
"angularjs validation directive",
18-
"validation directive",
19-
"angular validation",
20-
"angularjs validation",
21-
"javascript input validation",
22-
"multiple input validation",
23-
"order of priority validation"
24-
],
25-
"ignore": [
26-
"source",
27-
"spec",
28-
".bowerrc",
29-
".gitignore",
30-
".jshintignore",
31-
".jshintrc",
32-
"bower.json",
33-
"gruntfile.js",
34-
"package.json",
35-
"README.md"
36-
],
37-
"dependencies": {
38-
"angular": "~1.2.23",
39-
"json3": "~3.2.4",
40-
"es5-shim": "~2.1.0",
41-
"jquery": "~1.10.2",
42-
"lazy.js": "~0.3.2",
43-
"sass-bootstrap": "~3.0.0",
44-
"angular-resource": "~1.2.0",
45-
"angular-cookies": "~1.2.0",
46-
"angular-sanitize": "~1.2.0",
47-
"angular-route": "~1.2.0",
48-
"angular-bootstrap": "~0.7.0",
49-
"angular-template-retriever": "*",
50-
"angular-latest": "~1.2.17"
51-
},
52-
"devDependencies": {
53-
"angular-mocks": "~1.2.0",
54-
"angular-scenario": "~1.2.0"
55-
}
2+
"name": "angular-ui-form-validation",
3+
"version": "1.1.16",
4+
"main": "./dist/angular-ui-form-validation.js",
5+
"keywords": [
6+
"angular",
7+
"angular-validation",
8+
"angular-ui-form-validation",
9+
"angular-validator",
10+
"validation",
11+
"angularjs",
12+
"directive",
13+
"javascript",
14+
"nelson",
15+
"omuto",
16+
"angular",
17+
"validation",
18+
"directive",
19+
"angularjs",
20+
"validation",
21+
"directive",
22+
"validation",
23+
"directive",
24+
"angular",
25+
"validation",
26+
"angularjs",
27+
"validation",
28+
"javascript",
29+
"input",
30+
"validation",
31+
"multiple",
32+
"input",
33+
"validation",
34+
"order",
35+
"of",
36+
"priority",
37+
"validation"
38+
],
39+
"ignore": [
40+
"source",
41+
"spec",
42+
".bowerrc",
43+
".gitignore",
44+
".jshintignore",
45+
".jshintrc",
46+
"bower.json",
47+
"gruntfile.js",
48+
"package.json",
49+
"README.md",
50+
"**/.*",
51+
"node_modules",
52+
"bower_components",
53+
"app/bower_components",
54+
"test",
55+
"tests"
56+
],
57+
"dependencies": {
58+
"angular": "~1.2.24",
59+
"json3": "~3.2.4",
60+
"es5-shim": "~2.1.0",
61+
"jquery": "~1.10.2",
62+
"lazy.js": "~0.3.2",
63+
"sass-bootstrap": "~3.0.0",
64+
"angular-resource": "~1.2.0",
65+
"angular-cookies": "~1.2.0",
66+
"angular-sanitize": "~1.2.0",
67+
"angular-route": "~1.2.0",
68+
"angular-bootstrap": "~0.7.0",
69+
"bootstrap": "~3.2.0"
70+
},
71+
"devDependencies": {
72+
"angular-mocks": "~1.2.0",
73+
"angular-scenario": "~1.2.0"
74+
},
75+
"homepage": "https://github.com/nelsonomuto/angular-ui-form-validation",
76+
"authors": [
77+
"Nelson Omuto <nelsonomuto@gmail.com>"
78+
],
79+
"description": "AngularJS custom validation directives",
80+
"license": "MIT"
5681
}

‎dist/angular-ui-form-validation.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bower_components/angular-cookies/.bower.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "angular-cookies",
3-
"version": "1.2.23",
3+
"version": "1.2.24",
44
"main": "./angular-cookies.js",
55
"dependencies": {
6-
"angular": "1.2.23"
6+
"angular": "1.2.24"
77
},
88
"homepage": "https://github.com/angular/bower-angular-cookies",
9-
"_release": "1.2.23",
9+
"_release": "1.2.24",
1010
"_resolution": {
1111
"type": "version",
12-
"tag": "v1.2.23",
13-
"commit": "cd7cd2284a1adf8594a73ebf8dc3ff6d4d222449"
12+
"tag": "v1.2.24",
13+
"commit": "a9fe48d96d887e8c15e832a40fc563718212e9df"
1414
},
1515
"_source": "https://github.com/angular/bower-angular-cookies.git",
1616
"_target": "~1.2.0",

‎dist/bower_components/angular-cookies/angular-cookies.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.23
2+
* @license AngularJS v1.2.24
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

‎dist/bower_components/angular-cookies/angular-cookies.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bower_components/angular-cookies/bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "angular-cookies",
3-
"version": "1.2.23",
3+
"version": "1.2.24",
44
"main": "./angular-cookies.js",
55
"dependencies": {
6-
"angular": "1.2.23"
6+
"angular": "1.2.24"
77
}
88
}

‎dist/bower_components/angular-latest/.bower.json‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22
"name": "AngularJS",
33
"devDependencies": {
44
"jquery": "1.10.2",
5-
"lunr.js": "0.4.3",
6-
"open-sans-fontface": "1.0.4",
7-
"google-code-prettify": "1.0.1",
85
"closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip",
9-
"ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip",
10-
"bootstrap": "3.1.1"
6+
"ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
117
},
128
"homepage": "https://github.com/angular/angular.js",
13-
"version": "1.2.23",
14-
"_release": "1.2.23",
9+
"version": "1.2.24",
10+
"_release": "1.2.24",
1511
"_resolution": {
1612
"type": "version",
17-
"tag": "v1.2.23",
18-
"commit": "1a597bef42b8a0237fc50ac8b0d9a14f5fc00bef"
13+
"tag": "v1.2.24",
14+
"commit": "3e57ad0d8832004551d6e3be6faa96462eedfebf"
1915
},
2016
"_source": "https://github.com/angular/angular.js.git",
2117
"_target": "~1.2.17",

‎dist/bower_components/angular-latest/.bowerrc‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)