Skip to content

Core: Required rule take precedence over number & digits rules #1679

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

Closed
wants to merge 1 commit into from
Closed

Core: Required rule take precedence over number & digits rules #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ $.extend( $.validator, {
if ( type === "radio" || type === "checkbox" ) {
return this.findByName( element.name ).filter( ":checked" ).val();
} else if ( type === "number" && typeof element.validity !== "undefined" ) {
return element.validity.badInput ? false : $element.val();
return element.validity.badInput ? "NaN" : $element.val();
}

if ( element.hasAttribute( "contenteditable" ) ) {
Expand Down Expand Up @@ -713,7 +713,6 @@ $.extend( $.validator, {
for ( method in rules ) {
rule = { method: method, parameters: rules[ method ] };
try {

result = $.validator.methods[ method ].call( this, val, element, rule.parameters );

// If a method indicates that the field is optional and therefore valid,
Expand Down
43 changes: 43 additions & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,49 @@ test( "elementValue() returns the file input's name without the prefix 'C:\\fake
ok( !v.element( fileInput ), "The fake file input is invalid (length = 12, maxlength = 10)" );
} );

test( "", function() {
var v = $( "#userForm" ).validate(),

// A fake number input
numberInput = {
name: "fakeNumber",
type: "number",
nodeName: "INPUT",
value: "",
form: $( "#userForm" )[ 0 ],
validity: {
badInput: false
},
hasAttribute: function() { return false; },
getAttribute: function( name ) {
return this[ name ];
},
setAttribute: function() {}
};

v.defaultShowErrors = function() {};
v.validationTargetFor = function() {
return numberInput;
};

$( numberInput ).rules( "add", {
required: true
} );

deepEqual( $( numberInput ).rules(), { required: true, number: true } );
ok( !v.element( numberInput ), "The fake number input is invalid" );
equal( v.errorList[ 0 ].message, $.validator.messages.required, "The error message should be the one of required rule." );

numberInput.value = "Not A Number";
numberInput.validity.badInput = true;
ok( !v.element( numberInput ), "The fake number input is invalid" );
equal( v.errorList[ 0 ].message, $.validator.messages.number, "The error message should be the one of number rule." );

numberInput.value = "2015";
numberInput.validity.badInput = false;
ok( v.element( numberInput ), "The fake number input is valid" );
} );

test( "validating multiple checkboxes with 'required'", function() {
expect( 3 );
var checkboxes = $( "#form input[name=check3]" ).prop( "checked", false ),
Expand Down