Skip to content

Commit 3529335

Browse files
committed
Some more changes based on style guide. #6
1 parent 4f4a9bb commit 3529335

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

dist/bootstrap-angular-validation.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.

src/directives/validation.directive.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global angular */
2+
13
'use strict';
24

35
/**
@@ -10,10 +12,9 @@
1012
* Those element must have ng-model attributes. This directive will automatically add the 'has-error' class on the
1113
* parent element with class '.form-group' and will show/hide the validation message automatically.
1214
*/
13-
1415
angular.module('bootstrap.angular.validation').directive('bsValidation', [
1516
'$interpolate', 'BsValidationService',
16-
function($interpolate, bsValidationService, $log) {
17+
function($interpolate, bsValidationService) {
1718
return {
1819
restrict: 'A',
1920
require: ['ngModel', '^^form'],
@@ -24,7 +25,7 @@ angular.module('bootstrap.angular.validation').directive('bsValidation', [
2425

2526
// HTML selector helper
2627
var errorElementClass = 'bs-invalid-msg';
27-
var iconMarkup = '<i class=\'fa fa-exclamation-triangle fa-fw\'></i>';
28+
var iconMarkup = '<i class="fa fa-exclamation-triangle fa-fw"></i>';
2829
var formGroup = '.form-group';
2930
var customFormGroup = '[bs-form-group]';
3031
var helpBlock = 'help-block';
@@ -48,7 +49,7 @@ angular.module('bootstrap.angular.validation').directive('bsValidation', [
4849
}
4950

5051
var metaInformation = {};
51-
angular.forEach(bsValidationService.getMeta(), function(key){
52+
angular.forEach(bsValidationService.getMeta(), function(key) {
5253
metaInformation[key] = $element.attr(key);
5354
});
5455

@@ -85,27 +86,27 @@ angular.module('bootstrap.angular.validation').directive('bsValidation', [
8586
return false;
8687
}
8788

88-
function addErrors(){
89+
function addErrors() {
8990
addErrorClass();
9091
addErrorMessage();
9192
return false;
9293
}
9394

94-
function addSuccessClass(){
95+
function addSuccessClass() {
9596
formGroupElement.addClass('has-success');
9697
return removeErrors();
9798
}
9899

99-
function addErrorClass(){
100+
function addErrorClass() {
100101
formGroupElement.removeClass('has-success');
101102
formGroupElement.addClass('has-error');
102103
}
103104

104-
function renderError(message){
105+
function renderError(message) {
105106
return '<span class="' + markupClasses + '">' + iconMarkup + message + '</span>';
106107
}
107108

108-
function errorContainer(message){
109+
function errorContainer(message) {
109110
var insertAfter = $element;
110111
// Check if the container have any Bootstrap input group then append the error after it
111112
var groupElement = formGroupElement.findOne('.input-group');
@@ -115,17 +116,17 @@ angular.module('bootstrap.angular.validation').directive('bsValidation', [
115116
insertAfter.after(renderError(message));
116117
}
117118

118-
function addErrorMessage(){
119+
function addErrorMessage() {
119120
var message = resolveMessage(Object.keys(ngModelController.$error)[0]);
120121
var errorElement = formGroupElement.findOne('.' + errorElementClass);
121122
if (errorElement.length === 0) { errorContainer(message); }
122123
errorElement.html(iconMarkup + message).removeClass('ng-hide');
123124
}
124125

125126
function displayOrHideError() {
126-
if(ngModelController.$valid){ return addSuccessClass(); }
127-
if(ngModelController.$untouched){ return removeErrors(); }
128-
if(ngModelController.$invalid){ return addErrors(); }
127+
if (ngModelController.$valid) { return addSuccessClass(); }
128+
if (ngModelController.$untouched) { return removeErrors(); }
129+
if (ngModelController.$invalid) { return addErrors(); }
129130
}
130131

131132
}

src/services/validation.service.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ angular.module('bootstrap.angular.validation').factory('BsValidationService', fu
2727

2828
var genericValidators = {
2929
digits: function (value) {
30-
return (/^\d+$/).test(value);
30+
return (/^\d+$/).test(value);
3131
},
3232
equalto: function (value, $scope, attr) {
33-
return value+'' === attr.equalto+'';
33+
return value + '' === attr.equalto + '';
3434
},
3535
number: function (value) {
36-
return (/^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/).test(value);
36+
return (/^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/).test(value);
3737
},
3838
min: function (value, $scope, attr) {
39-
return parseFloat(value) >= parseFloat(attr.min);
39+
return parseFloat(value) >= parseFloat(attr.min);
4040
},
4141
max: function (value, $scope, attr) {
42-
return parseFloat(value) <= parseFloat(attr.max);
42+
return parseFloat(value) <= parseFloat(attr.max);
4343
},
4444
length: function (value, $scope, attr) {
45-
return value.length === parseInt(attr.length);
45+
return value.length === parseInt(attr.length);
4646
},
47-
strictemail: function(value, $scope, attr) {
48-
return new RegExp(/^[_a-z0-9]+(\.[_a-z0-9]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/).test(value);
47+
strictemail: function (value) {
48+
return new RegExp(/^[_a-z0-9]+(\.[_a-z0-9]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/).test(value);
4949
}
5050
};
5151

@@ -65,13 +65,13 @@ angular.module('bootstrap.angular.validation').factory('BsValidationService', fu
6565
* need not a add it for every form element.
6666
* @param $element
6767
*/
68-
getValidators: function (){
69-
var builtIn = ['equalto', 'min', 'max', 'number', 'digits', 'length']
68+
getValidators: function () {
69+
var builtIn = ['equalto', 'min', 'max', 'number', 'digits', 'length'];
7070
var additional = Object.keys(genericValidators);
7171
return builtIn.concat(additional);
7272
},
7373

74-
getMeta: function (){
74+
getMeta: function () {
7575
return ['matchName'];
7676
},
7777

@@ -106,7 +106,7 @@ angular.module('bootstrap.angular.validation').factory('BsValidationService', fu
106106

107107
getDefaultMessage: function (key) {
108108
return messages[key];
109-
},
109+
}
110110

111111
};
112112
});

0 commit comments

Comments
 (0)