Skip to content

Commit 47f8326

Browse files
victorjonssonvictorjonsson
committed
Fixed issue victorjonsson#373: Don't display empty error message container if input is valid
1 parent 9b627d0 commit 47f8326

Some content is hidden

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

48 files changed

+75
-69
lines changed

‎form-validator/brazil.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* @website http://formvalidator.net/#brazil-validators
1313
* @license MIT
14-
* @version 2.2.144
14+
* @version 2.2.157
1515
*/
1616

1717
$.formUtils.addValidator({

‎form-validator/brazil.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.

‎form-validator/date.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @website http://formvalidator.net/#location-validators
1212
* @license MIT
13-
* @version 2.2.144
13+
* @version 2.2.157
1414
*/
1515
(function($) {
1616

‎form-validator/date.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* JQUERY-FORM-VALIDATOR
33
*
4-
* @version 2.2.144
4+
* @version 2.2.157
55
* @website http://formvalidator.net/
66
* @author Victor Jonsson, http://victorjonsson.se
77
* @license MIT

‎form-validator/file.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @website http://formvalidator.net/#file-validators
1212
* @license MIT
13-
* @version 2.2.144
13+
* @version 2.2.157
1414
*/
1515
(function($, window) {
1616

‎form-validator/file.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.

‎form-validator/html5.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* @website http://formvalidator.net/
1919
* @license MIT
20-
* @version 2.2.144
20+
* @version 2.2.157
2121
*/
2222
(function($, window) {
2323

‎form-validator/html5.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.

‎form-validator/jquery.form-validator.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎form-validator/jsconf.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* @website http://formvalidator.net/#location-validators
99
* @license MIT
10-
* @version 2.2.144
10+
* @version 2.2.157
1111
*/
1212
(function($) {
1313

‎form-validator/jsconf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* JQUERY-FORM-VALIDATOR
33
*
4-
* @version 2.2.144
4+
* @version 2.2.157
55
* @website http://formvalidator.net/
66
* @author Victor Jonsson, http://victorjonsson.se
77
* @license MIT

‎form-validator/lang/cz.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/cz.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.

‎form-validator/lang/de.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/de.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.

‎form-validator/lang/es.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/es.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.

‎form-validator/lang/fr.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/fr.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.

‎form-validator/lang/it.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/it.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.

‎form-validator/lang/pl.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/pl.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.

‎form-validator/lang/pt.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/pt.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.

‎form-validator/lang/ro.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/ro.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.

‎form-validator/lang/ru.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/ru.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.

‎form-validator/lang/sv.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @website http://formvalidator.net/
88
* @license MIT
9-
* @version 2.2.145
9+
* @version 2.2.157
1010
*/
1111
(function($, window) {
1212

‎form-validator/lang/sv.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.

‎form-validator/location.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @website http://formvalidator.net/#location-validators
1212
* @license MIT
13-
* @version 2.2.144
13+
* @version 2.2.157
1414
*/
1515
(function($) {
1616

‎form-validator/location.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.

‎form-validator/sanitize.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*
2424
* @website http://formvalidator.net/
2525
* @license MIT
26-
* @version 2.2.144
26+
* @version 2.2.157
2727
*/
2828
(function($, window) {
2929

‎form-validator/sanitize.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎form-validator/security.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @website http://formvalidator.net/#security-validators
1616
* @license MIT
17-
* @version 2.2.144
17+
* @version 2.2.157
1818
*/
1919
(function($, window) {
2020

‎form-validator/security.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.

‎form-validator/src/dialogs.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,18 @@
5252
.remove();
5353
});
5454
},
55-
setInlineErrorMessage: function ($input, mess, conf, $messageContainer) {
55+
setInlineErrorMessage: function ($input, errorMsg, conf, $messageContainer) {
5656
var custom = document.getElementById($input.attr('name') + '_err_msg'),
5757
setErrorMessage = function ($elem) {
5858
$.formUtils.$win.trigger('validationErrorDisplay', [$input, $elem]);
59-
$elem.html(mess);
60-
},
61-
$mess = {};
59+
$elem.html(errorMsg);
60+
};
6261

6362
if (custom) {
6463
$.formUtils.warn('Using deprecated element reference ' + custom.id);
6564
$messageContainer = $(custom);
6665
} else if (typeof $messageContainer === 'function') {
67-
$messageContainer = $messageContainer($input, mess, conf);
66+
$messageContainer = $messageContainer($input, errorMsg, conf);
6867
}
6968

7069
if (typeof $messageContainer === 'object') {
@@ -76,28 +75,28 @@
7675
}
7776
});
7877
if ($found) {
79-
if (!mess) {
78+
if (!errorMsg) {
8079
$found.remove();
8180
} else {
8281
setErrorMessage($found);
8382
}
84-
} else {
85-
$mess = $('<div class="' + conf.errorMessageClass + '"></div>');
86-
setErrorMessage($mess);
87-
$mess[0].inputReferer = $input[0];
88-
$messageContainer.prepend($mess);
83+
} else if(errorMsg !== '') {
84+
var $message = $('<div class="' + conf.errorMessageClass + ' alert"></div>');
85+
setErrorMessage($message);
86+
$message[0].inputReferer = $input[0];
87+
$messageContainer.prepend($message);
8988
}
9089
}
9190
else {
92-
var $parent = this.getParentContainer($input);
93-
$mess = $parent.find('.' + conf.errorMessageClass + '.help-block');
91+
var $parent = this.getParentContainer($input),
92+
$message = $parent.find('.' + conf.errorMessageClass + '.help-block');
9493

95-
if ($mess.length === 0) {
96-
$mess = $('<span></span>').addClass('help-block').addClass(conf.errorMessageClass);
97-
$mess.appendTo($parent);
94+
if ($message.length === 0) {
95+
$message = $('<span></span>').addClass('help-block').addClass(conf.errorMessageClass);
96+
$message.appendTo($parent);
9897
}
9998

100-
setErrorMessage($mess);
99+
setErrorMessage($message);
101100
}
102101
},
103102
setTemplateMessage: function ($form, title, errorMessages, conf) {

0 commit comments

Comments
 (0)