Skip to content

Commit 0406e5c

Browse files
committed
Update jquery.form-validator.js
Fixed UI issue for bootstrap input groups
1 parent 0b2f3bc commit 0406e5c

File tree

1 file changed

+30
-23
lines changed

1 file changed

+30
-23
lines changed

form-validator/jquery.form-validator.js

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
.text(help)
7373
.hide();
7474
}
75-
75+
7676
$element
7777
.addClass('has-help-txt')
7878
.bind('focus.validation', function() {
@@ -123,7 +123,7 @@
123123
if ($parent.hasClass('input-group')){
124124
var $parent = $parent.parent();
125125
}
126-
126+
127127
// Remove possible error style applied by previous validation
128128
$element
129129
.removeClass(config.errorElementClass)
@@ -132,11 +132,9 @@
132132
.find('.'+config.errorMessageClass).remove();
133133

134134
// Twitter bs
135-
$form.find('.has-error').removeClass('has-error');
136135
$element.removeClass('valid');
137-
$element
138-
.parent()
139-
.removeClass('has-success');
136+
$parent.removeClass('has-error');
137+
$parent.removeClass('has-success');
140138

141139
// if element has custom err msg container, clear it
142140
if( elementErrMsgObj != null) {
@@ -149,21 +147,20 @@
149147

150148
if(validation === true) {
151149
$element
152-
.addClass('valid')
153-
.parent()
154-
.removeClass('has-error')
150+
.addClass('valid');
151+
$parent
155152
.addClass('has-success'); // twitter bs
156153
} else if(validation === null) {
157154
$element
158-
.removeClass('valid')
159-
.parent()
155+
.removeClass('valid');
156+
$parent
160157
.removeClass('has-error')
161158
.removeClass('has-success'); // twitter bs
162159
} else {
163160
$element
164161
.addClass(config.errorElementClass)
165-
.removeClass('valid')
166-
.parent()
162+
.removeClass('valid');
163+
$parent
167164
.addClass('has-error')
168165
.removeClass('has-success'); // twitter bs
169166

@@ -172,9 +169,7 @@
172169
elementErrMsgObj.innerHTML = validation;
173170
} else { // use regular span append
174171
$parent.append('<span class="'+config.errorMessageClass+' help-block">'+validation+'</span>');
175-
$element
176-
.parent()
177-
.addClass('has-error'); // twitter bs
172+
$parent.addClass('has-error'); // twitter bs
178173
}
179174

180175
if(config.borderColorOnError !== '') {
@@ -232,6 +227,12 @@
232227
* @para {jQuery} $element
233228
*/
234229
var addErrorMessage = function(mess, $element) {
230+
var $parent = $element.parent();
231+
// Twitter bs
232+
if ($parent.hasClass('input-group')){
233+
var $parent = $parent.parent();
234+
}
235+
235236
// validate server side will return null as error message before the server is requested
236237
if(mess !== null) {
237238
if ($.inArray(mess, errorMessages) < 0) {
@@ -240,8 +241,8 @@
240241
errorInputs.push($element);
241242
$element
242243
.valAttr('current-error', mess)
243-
.removeClass('valid')
244-
.parent()
244+
.removeClass('valid');
245+
$parent
245246
.removeClass('has-success');
246247
}
247248
},
@@ -274,6 +275,12 @@
274275
//
275276
$form.find('input,textarea,select').filter(':not([type="submit"],[type="button"])').each(function() {
276277
var $element = $(this);
278+
var $parent = $element.parent();
279+
// Twitter bs
280+
if ($parent.hasClass('input-group')){
281+
var $parent = $parent.parent();
282+
}
283+
277284
var elementType = $element.attr('type');
278285
if (!ignoreInput($element.attr('name'), elementType)) {
279286

@@ -292,9 +299,9 @@
292299
} else {
293300
$element
294301
.valAttr('current-error', false)
295-
.addClass('valid')
296-
.parent()
297-
.addClass('has-success');
302+
.addClass('valid');
303+
$parent
304+
.addClass('has-success');
298305
}
299306
}
300307

@@ -864,8 +871,8 @@
864871
year = findDateUnit('y', formatParts, matches);
865872

866873
if ((month === 2 && day > 28 && (year % 4 !== 0 || year % 100 === 0 && year % 400 !== 0))
867-
|| (month === 2 && day > 29 && (year % 4 === 0 || year % 100 !== 0 && year % 400 === 0))
868-
|| month > 12 || month === 0) {
874+
|| (month === 2 && day > 29 && (year % 4 === 0 || year % 100 !== 0 && year % 400 === 0))
875+
|| month > 12 || month === 0) {
869876
return false;
870877
}
871878
if ((this.isShortMonth(month) && day > 30) || (!this.isShortMonth(month) && day > 31) || day === 0) {

0 commit comments

Comments
 (0)