|
13 | 13 |
|
14 | 14 | var $window = $(window), |
15 | 15 | _applyErrorStyle = function($elem, conf) { |
| 16 | + var $parent = $elem.parent(); |
16 | 17 | $elem |
17 | 18 | .addClass(conf.errorElementClass) |
18 | | - .removeClass('valid') |
19 | | - .parent() |
20 | | - .addClass('has-error') |
21 | | - .removeClass('has-success'); // twitter bs |
| 19 | + .removeClass('valid'); |
| 20 | + if($parent.hasClass("input-group")) $parent = $parent.parent(); |
| 21 | + |
| 22 | + $parent.addClass('has-error') .removeClass('has-success'); //twitter bs |
| 23 | + |
22 | 24 |
|
23 | 25 | if(conf.borderColorOnError !== '') { |
24 | 26 | $elem.css('border-color', conf.borderColorOnError); |
|
27 | 29 | _removeErrorStyle = function($elem, conf) { |
28 | 30 | $elem.each(function() { |
29 | 31 | _setInlineErrorMessage($(this), '', conf, conf.errorMessagePosition); |
| 32 | + var $parent = $(this).parent(); |
| 33 | + |
| 34 | + if($parent.hasClass("input-group")) $parent = $parent.parent(); |
30 | 35 | $(this) |
31 | 36 | .removeClass('valid') |
32 | 37 | .removeClass(conf.errorElementClass) |
33 | | - .css('border-color', '') |
34 | | - .parent() |
35 | | - .removeClass('has-error') |
36 | | - .removeClass('has-success') |
37 | | - .find('.'+conf.errorMessageClass) // remove inline error message |
38 | | - .remove(); |
| 38 | + .css('border-color', ''); |
| 39 | + $parent |
| 40 | + .removeClass('has-error') |
| 41 | + .removeClass('has-success') |
| 42 | + .find('.'+conf.errorMessageClass) // remove inline error message |
| 43 | + .remove(); |
39 | 44 | }); |
40 | 45 | }, |
41 | 46 | _setInlineErrorMessage = function($input, mess, conf, $messageContainer) { |
42 | 47 | var custom = _getInlineErrorElement($input); |
| 48 | + var $parent = $input.parent(); |
| 49 | + if($parent.hasClass("input-group")) $parent = $parent.parent(); |
43 | 50 | if( custom ) { |
44 | 51 | custom.innerHTML = mess; |
45 | 52 | } |
|
64 | 71 | } |
65 | 72 | } |
66 | 73 | else { |
67 | | - var $mess = $input.parent().find('.'+conf.errorMessageClass+'.help-block'); |
| 74 | + var $mess = $parent.find('.'+conf.errorMessageClass+'.help-block'); |
68 | 75 | if( $mess.length == 0 ) { |
69 | 76 | $mess = $('<span></span>').addClass('help-block').addClass(conf.errorMessageClass); |
70 | | - $mess.appendTo($input.parent()); |
| 77 | + $mess.appendTo($parent); |
71 | 78 | } |
72 | 79 | $mess.html(mess); |
73 | 80 | } |
|
0 commit comments