From e4f34c622cf99ca498e7c64b5d8f50057b9bdc55 Mon Sep 17 00:00:00 2001 From: Brahim Arkni Date: Sat, 3 Mar 2018 22:20:09 +0000 Subject: [PATCH] Core: simplify destroy method --- src/additional/greaterThan.js | 4 ++-- src/additional/greaterThanEqual.js | 4 ++-- src/additional/lessThan.js | 4 ++-- src/additional/lessThanEqual.js | 4 ++-- src/core.js | 22 +++++----------------- test/test.js | 24 ++++++++++++------------ 6 files changed, 25 insertions(+), 37 deletions(-) diff --git a/src/additional/greaterThan.js b/src/additional/greaterThan.js index 67d8c3050..ec5740a7a 100644 --- a/src/additional/greaterThan.js +++ b/src/additional/greaterThan.js @@ -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(); } ); } diff --git a/src/additional/greaterThanEqual.js b/src/additional/greaterThanEqual.js index de6203728..e7df72f04 100644 --- a/src/additional/greaterThanEqual.js +++ b/src/additional/greaterThanEqual.js @@ -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(); } ); } diff --git a/src/additional/lessThan.js b/src/additional/lessThan.js index 2959bc362..9099802d1 100644 --- a/src/additional/lessThan.js +++ b/src/additional/lessThan.js @@ -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(); } ); } diff --git a/src/additional/lessThanEqual.js b/src/additional/lessThanEqual.js index 78a1e25a6..408696ef1 100644 --- a/src/additional/lessThanEqual.js +++ b/src/additional/lessThanEqual.js @@ -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(); } ); } diff --git a/src/core.js b/src/core.js index 74d195e42..560ec9544 100644 --- a/src/core.js +++ b/src/core.js @@ -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" ); } }, @@ -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(); } ); } diff --git a/test/test.js b/test/test.js index 79bf0cf1b..c61028d00 100644 --- a/test/test.js +++ b/test/test.js @@ -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" ); } ); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy