Skip to content

Commit 5c6ac8c

Browse files
committed
abstracting class names has-error has-success
and cleaning up some code
1 parent 1b99b52 commit 5c6ac8c

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

form-validator/jquery.form-validator.js

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313

1414
var $window = $(window),
1515
_applyErrorStyle = function($elem, conf) {
16-
var $parent = $elem.parent();
1716
$elem
1817
.addClass(conf.errorElementClass)
1918
.removeClass('valid');
20-
if($parent.hasClass("input-group")) $parent = $parent.parent();
19+
var $parent = $elem.parent();
20+
if($parent.hasClass("input-group")) $parent = $parent.parent();
2121

22-
$parent.addClass('has-error') .removeClass('has-success'); //twitter bs
23-
22+
$parent
23+
.addClass(conf.inputParentClassOnError)
24+
.removeClass(conf.inputParentClassOnSuccess);
2425

2526
if(conf.borderColorOnError !== '') {
2627
$elem.css('border-color', conf.borderColorOnError);
@@ -29,24 +30,24 @@
2930
_removeErrorStyle = function($elem, conf) {
3031
$elem.each(function() {
3132
_setInlineErrorMessage($(this), '', conf, conf.errorMessagePosition);
32-
var $parent = $(this).parent();
3333

34-
if($parent.hasClass("input-group")) $parent = $parent.parent();
3534
$(this)
3635
.removeClass('valid')
3736
.removeClass(conf.errorElementClass)
3837
.css('border-color', '');
38+
39+
var $parent = $(this).parent();
40+
if($parent.hasClass("input-group")) $parent = $parent.parent();
3941
$parent
40-
.removeClass('has-error')
41-
.removeClass('has-success')
42-
.find('.'+conf.errorMessageClass) // remove inline error message
42+
.removeClass(conf.inputParentClassOnError)
43+
.removeClass(conf.inputParentClassOnSuccess);
44+
.find('.'+conf.errorMessageClass) // remove inline span holding error message
4345
.remove();
4446
});
4547
},
4648
_setInlineErrorMessage = function($input, mess, conf, $messageContainer) {
4749
var custom = _getInlineErrorElement($input);
48-
var $parent = $input.parent();
49-
if($parent.hasClass("input-group")) $parent = $parent.parent();
50+
5051
if( custom ) {
5152
custom.innerHTML = mess;
5253
}
@@ -71,6 +72,8 @@
7172
}
7273
}
7374
else {
75+
var $parent = $input.parent();
76+
if($parent.hasClass("input-group")) $parent = $parent.parent();
7477
var $mess = $parent.find('.'+conf.errorMessageClass+'.help-block');
7578
if( $mess.length == 0 ) {
7679
$mess = $('<span></span>').addClass('help-block').addClass(conf.errorMessageClass);
@@ -236,7 +239,8 @@
236239
$elem
237240
.addClass('valid')
238241
.parent()
239-
.addClass('has-success'); // twitter bs
242+
.addClass(conf.inputParentClassOnSuccess);
243+
240244
} else if(validation !== null) {
241245

242246
_applyErrorStyle($elem, conf);
@@ -372,7 +376,7 @@
372376
.valAttr('current-error', false)
373377
.addClass('valid')
374378
.parent()
375-
.addClass('has-success');
379+
.addClass(conf.inputParentClassOnSuccess);
376380
}
377381
}
378382

@@ -621,7 +625,9 @@
621625
scrollToTopOnError : true,
622626
dateFormat : 'yyyy-mm-dd',
623627
addValidClassOnAll : false, // whether or not to apply class="valid" even if the input wasn't validated
624-
decimalSeparator : '.'
628+
decimalSeparator : '.',
629+
inputParentClassOnError : 'has-error', // twitter-bootstrap default class name
630+
inputParentClassOnSuccess : 'has-success' // twitter-bootstrap default class name
625631
}
626632
},
627633

0 commit comments

Comments
 (0)