Skip to content

Fix reset errors with "remote" validation #2150 #2191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anufrien wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix reset errors with "remote" validation #2150 #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
075b7cf
Fix #2150
anufrien Jul 16, 2018
1eb3c94
fix code style
anufrien Jul 16, 2018
ee6327b
fix not defined var
anufrien Jul 16, 2018
aaf0713
fix unit test
anufrien Jul 17, 2018
e249ea8
fix comment
anufrien Jul 17, 2018
f7a99c9
fix comment
anufrien Jul 17, 2018
9969c67
Fix test
anufrien Jul 17, 2018
a682166
fix test
anufrien Jul 17, 2018
8c331d5
add empty line
anufrien Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,9 +912,16 @@ $.extend( $.validator, {
},

invalidElements: function() {
return $( this.errorList ).map( function() {
return this.element;
var
v = this,
invalid = $.extend( {}, v.invalid ),
$elements = $( [] );
$.each( invalid, function( key, value ) {
if ( value !== false && invalid.hasOwnProperty( key ) ) {
$elements = $elements.add( v.findByName( key ) );
}
} );
return $elements;
},

showLabel: function( element, message ) {
Expand Down Expand Up @@ -1532,7 +1539,7 @@ $.extend( $.validator, {
method = typeof method === "string" && method || "remote";

var previous = this.previousValue( element, method ),
validator, data, optionDataString;
validator, data, optionDataString, result = "pending";

if ( !this.settings.messages[ element.name ] ) {
this.settings.messages[ element.name ] = {};
Expand Down Expand Up @@ -1577,11 +1584,13 @@ $.extend( $.validator, {
validator.invalid[ element.name ] = true;
validator.showErrors( errors );
}
previous.valid = valid;

// Fix for QUnit test "remote" method with ajax immediate callback
result = previous.valid = valid;
validator.stopRequest( element, valid );
}
}, param ) );
return "pending";
return result;
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/methods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ QUnit.test( "remote, highlight all invalid fields", function( assert ) {
}, 500 );
} );
QUnit.test( "remote, unhighlighted should be invoked after being highlighted/invalid", function( assert ) {
assert.expect( 6 );
assert.expect( 7 );

var done1 = assert.async(),
done2 = assert.async(),
Expand Down
4 changes: 2 additions & 2 deletions test/rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,10 @@ QUnit.test( "rules(), global/local normalizer", function( assert ) {

// Validate only the username and the url elements.
username.valid();
assert.equal( v.invalidElements()[ 0 ], username[ 0 ], "The username should be invalid" );
assert.equal( v.invalidElements().filter( username )[ 0 ], username[ 0 ], "The username should be invalid" );

urlc.valid();
assert.equal( v.invalidElements()[ 0 ], urlc[ 0 ], "The url should be invalid" );
assert.equal( v.invalidElements().filter( urlc )[ 0 ], urlc[ 0 ], "The url should be invalid" );

assert.equal( v.numberOfInvalids(), 2, "There is two invalid elements" );

Expand Down