Skip to content

Core: simplify destroy method #2183

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
Arkni wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Core: simplify destroy method #2183

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
4 changes: 2 additions & 2 deletions src/additional/greaterThan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$.validator.addMethod( "greaterThan", function( value, element, param ) {
var target = $( param );

if ( this.settings.onfocusout && target.not( ".validate-greaterThan-blur" ).length ) {
target.addClass( "validate-greaterThan-blur" ).on( "blur.validate-greaterThan", function() {
if ( this.settings.onfocusout && target.not( ".validate-custom-blur" ).length ) {
target.addClass( "validate-custom-blur" ).on( "blur.validate-custom-blur", function() {
$( element ).valid();
} );
}
Expand Down
4 changes: 2 additions & 2 deletions src/additional/greaterThanEqual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$.validator.addMethod( "greaterThanEqual", function( value, element, param ) {
var target = $( param );

if ( this.settings.onfocusout && target.not( ".validate-greaterThanEqual-blur" ).length ) {
target.addClass( "validate-greaterThanEqual-blur" ).on( "blur.validate-greaterThanEqual", function() {
if ( this.settings.onfocusout && target.not( ".validate-custom-blur" ).length ) {
target.addClass( "validate-custom-blur" ).on( "blur.validate-custom-blur", function() {
$( element ).valid();
} );
}
Expand Down
4 changes: 2 additions & 2 deletions src/additional/lessThan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$.validator.addMethod( "lessThan", function( value, element, param ) {
var target = $( param );

if ( this.settings.onfocusout && target.not( ".validate-lessThan-blur" ).length ) {
target.addClass( "validate-lessThan-blur" ).on( "blur.validate-lessThan", function() {
if ( this.settings.onfocusout && target.not( ".validate-custom-blur" ).length ) {
target.addClass( "validate-custom-blur" ).on( "blur.validate-custom-blur", function() {
$( element ).valid();
} );
}
Expand Down
4 changes: 2 additions & 2 deletions src/additional/lessThanEqual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$.validator.addMethod( "lessThanEqual", function( value, element, param ) {
var target = $( param );

if ( this.settings.onfocusout && target.not( ".validate-lessThanEqual-blur" ).length ) {
target.addClass( "validate-lessThanEqual-blur" ).on( "blur.validate-lessThanEqual", function() {
if ( this.settings.onfocusout && target.not( ".validate-custom-blur" ).length ) {
target.addClass( "validate-custom-blur" ).on( "blur.validate-custom-blur", function() {
$( element ).valid();
} );
}
Expand Down
22 changes: 5 additions & 17 deletions src/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,21 +1118,9 @@ $.extend( $.validator, {
$( this.currentForm )
.off( ".validate" )
.removeData( "validator" )
.find( ".validate-equalTo-blur" )
.off( ".validate-equalTo" )
.removeClass( "validate-equalTo-blur" )
.find( ".validate-lessThan-blur" )
.off( ".validate-lessThan" )
.removeClass( "validate-lessThan-blur" )
.find( ".validate-lessThanEqual-blur" )
.off( ".validate-lessThanEqual" )
.removeClass( "validate-lessThanEqual-blur" )
.find( ".validate-greaterThanEqual-blur" )
.off( ".validate-greaterThanEqual" )
.removeClass( "validate-greaterThanEqual-blur" )
.find( ".validate-greaterThan-blur" )
.off( ".validate-greaterThan" )
.removeClass( "validate-greaterThan-blur" );
.find( ".validate-custom-blur" )
.off( ".validate-custom-blur" )
.removeClass( "validate-custom-blur" );
}

},
Expand Down Expand Up @@ -1497,8 +1485,8 @@ $.extend( $.validator, {

// Bind to the blur event of the target in order to revalidate whenever the target field is updated
var target = $( param );
if ( this.settings.onfocusout && target.not( ".validate-equalTo-blur" ).length ) {
target.addClass( "validate-equalTo-blur" ).on( "blur.validate-equalTo", function() {
if ( this.settings.onfocusout && target.not( ".validate-custom-blur" ).length ) {
target.addClass( "validate-custom-blur" ).on( "blur.validate-custom-blur", function() {
$( element ).valid();
} );
}
Expand Down
24 changes: 12 additions & 12 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2448,23 +2448,23 @@ QUnit.test( "destroy()", function( assert ) {
assert.strictEqual( form.data( "validator" ), validate );

form.valid();
assert.equal( $( "#x1", form ).hasClass( "validate-equalTo-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#x2", form ).hasClass( "validate-equalTo-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#x1", form ).hasClass( "validate-custom-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#x2", form ).hasClass( "validate-custom-blur" ), true, "The blur event should be bound to this element" );

assert.equal( $( "#y1", form ).hasClass( "validate-greaterThan-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#y2", form ).hasClass( "validate-lessThan-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#z1", form ).hasClass( "validate-greaterThanEqual-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#z2", form ).hasClass( "validate-lessThanEqual-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#y1", form ).hasClass( "validate-custom-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#y2", form ).hasClass( "validate-custom-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#z1", form ).hasClass( "validate-custom-blur" ), true, "The blur event should be bound to this element" );
assert.equal( $( "#z2", form ).hasClass( "validate-custom-blur" ), true, "The blur event should be bound to this element" );

validate.destroy();
assert.strictEqual( form.data( "validator" ), undefined );
assert.equal( $( "#x1", form ).hasClass( "validate-equalTo-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#x2", form ).hasClass( "validate-equalTo-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#x1", form ).hasClass( "validate-custom-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#x2", form ).hasClass( "validate-custom-blur" ), false, "The blur event should be unbound from this element" );

assert.equal( $( "#y1", form ).hasClass( "validate-lessThan-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#y2", form ).hasClass( "validate-greaterThan-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#z1", form ).hasClass( "validate-equalTo-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#z2", form ).hasClass( "validate-greaterThan-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#y1", form ).hasClass( "validate-custom-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#y2", form ).hasClass( "validate-custom-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#z1", form ).hasClass( "validate-custom-blur" ), false, "The blur event should be unbound from this element" );
assert.equal( $( "#z2", form ).hasClass( "validate-custom-blur" ), false, "The blur event should be unbound from this element" );

} );

Expand Down