Skip to content

Commit 4acd356

Browse files
committed
Clean up and fix for toggleDisabled with optional inputs.
1 parent f05f268 commit 4acd356

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/main/async.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154
var $input = $(this);
155155
$input.valAttr('async', false);
156156
$.each($.split($input.attr('data-validation')), function (i, validatorName) {
157-
console.log(validatorName);
158157
var validator = $.formUtils.validators['validate_'+validatorName];
159158
if (validator && validator.async) {
160159
$input.valAttr('async', 'yes');

src/modules/file.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
files = $input.get(0).files || [],
8585
mime = '',
8686
allowedTypes = _getTypes($input);
87-
console.log(files[0]);
8887

8988
if( files.length ) {
9089
$.each(files, function(i, file) {

src/modules/toggleDisabled.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
.find('*[data-validation]')
5656
.valAttr('event','keyup change')
5757
.on('validation', function(evt, valid) {
58-
if( !isCheckingIfFormValid ) {
58+
if (!isCheckingIfFormValid) {
5959
isCheckingIfFormValid = true;
6060
var $form = $(this).closest('form');
6161
if(valid && peekIfFormIsSuccessfullyValidated($form, this, conf)) {
@@ -103,8 +103,11 @@
103103
var allValid = true;
104104
$form.find('[data-validation]').each(function() {
105105
if (this !== excludeInputElement) {
106-
var $elem = $(this);
107-
if (!$elem.hasClass(config.successElementClass) || $elem.hasClass(config.errorElementClass)) {
106+
var $elem = $(this),
107+
hasSuccessfullyValidated = $elem.hasClass(config.successElementClass),
108+
isOptional = $elem.valAttr('optional') === 'true',
109+
isInvalid = $elem.hasClass(config.errorElementClass);
110+
if (isInvalid || (!hasSuccessfullyValidated && !isOptional)) {
108111
allValid = false;
109112
return false;
110113
}

0 commit comments

Comments
 (0)