From 5d36fe3210787009e15e05ad602525d0c2823b5c Mon Sep 17 00:00:00 2001 From: jeresig Date: Thu, 11 Feb 2010 16:50:26 -0500 Subject: [PATCH] Make sure that live mouseenter/mouseleave work properly. Fixes #6077. --- src/event.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/event.js b/src/event.js index e15a2ea6..986322f7 100644 --- a/src/event.js +++ b/src/event.js @@ -917,9 +917,16 @@ jQuery.fn.extend({ } }); +var liveMap = { + focus: "focusin", + blur: "focusout", + mouseenter: "mouseover", + mouseleave: "mouseout" +}; + jQuery.each(["live", "die"], function( i, name ) { jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) { - var type, i = 0, match, namespaces, + var type, i = 0, match, namespaces, preType, selector = origSelector || this.selector, context = origSelector ? this : jQuery( this.context ); @@ -939,18 +946,19 @@ jQuery.each(["live", "die"], function( i, name ) { type = type.replace( rnamespaces, "" ); } - type = type === "focus" ? "focusin" : // focus --> focusin - type === "blur" ? "focusout" : // blur --> focusout - type === "hover" ? types.push("mouseleave" + namespaces) && "mouseenter" : // hover support - type; + if ( type === "hover" ) { + types.push( "mouseenter" + namespaces, "mouseleave" + namespaces ); + continue; + } - type += namespaces; + preType = type; + type = (liveMap[ type ] || type) + namespaces; if ( name === "live" ) { // bind live handler context.each(function(){ jQuery.event.add( this, liveConvert( type, selector ), - { data: data, selector: selector, handler: fn, origType: type, origHandler: fn } ); + { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); }); } else { @@ -999,7 +1007,7 @@ function liveHandler( event ) { related = null; // Those two events require additional checking - if ( handleObj.origType === "mouseenter" || handleObj.origType === "mouseleave" ) { + if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) { related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0]; }