library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the relatedTarget adjustment for mouseenter/leave events, it's an ambiguous case anyway and it is expensive to do.

Browse Source
This commit is contained in:
Dave Methvin 2011-09-08 09:03:16 -04:00 committed by timmywil
parent 2886249e84
commit 38601e07da
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/event.js
View File

@ -699,8 +699,7 @@ jQuery.Event.prototype = {
isImmediatePropagationStopped: returnFalse isImmediatePropagationStopped: returnFalse
}; };
// Create mouseenter and mouseleave events; IE has its own native ones but // Create mouseenter/leave events using mouseover/out and event-time checks
// we need to support event delegation as well so we don't use them.
jQuery.each({ jQuery.each({
mouseenter: "mouseover", mouseenter: "mouseover",
mouseleave: "mouseout" mouseleave: "mouseout"
@ -716,12 +715,9 @@ jQuery.each({
selector = handleObj.selector, selector = handleObj.selector,
oldType, ret; oldType, ret;
// For a real mouseover/out, always call the handler; for
// mousenter/leave call the handler if related is outside the target.
// NB: No relatedTarget if the mouse left/entered the browser window // NB: No relatedTarget if the mouse left/entered the browser window
if ( selector && related ) {
// Delegated event; find the real relatedTarget
related = jQuery( related ).closest( selector )[0];
}
// For mouseover/out, contains isn't needed; handle() already determined it's the right target
if ( !related || handleObj.origType === event.type || (related !== target && !jQuery.contains( target, related )) ) { if ( !related || handleObj.origType === event.type || (related !== target && !jQuery.contains( target, related )) ) {
oldType = event.type; oldType = event.type;
event.type = handleObj.origType; event.type = handleObj.origType;

24
test/hovertest.html
View File

@ -44,8 +44,7 @@ p {
Mouse over here should NOT trigger the counter. Mouse over here should NOT trigger the counter.
</div> </div>
</div> </div>
<div id="liveenterbox" class="hover-box">
<div id="livebox" class="hover-box">
<div class="hover-status"> <div class="hover-status">
<button>Activate</button> <button>Activate</button>
Live enter/leave: <span class="ins">0</span> / <span class="outs">0</span> Live enter/leave: <span class="ins">0</span> / <span class="outs">0</span>
@ -54,7 +53,6 @@ p {
Mouse over here should NOT trigger the counter. Mouse over here should NOT trigger the counter.
</div> </div>
</div> </div>
<div id="delegateenterbox" class="hover-box"> <div id="delegateenterbox" class="hover-box">
<div class="hover-status"> <div class="hover-status">
<button>Activate</button> <button>Activate</button>
@ -74,6 +72,15 @@ p {
Mouse over here SHOULD trigger the counter. Mouse over here SHOULD trigger the counter.
</div> </div>
</div> </div>
<div id="liveoverbox" class="hover-box">
<div class="hover-status">
<button>Activate</button>
Live over/out: <span class="ins">0</span> / <span class="outs">0</span>
</div>
<div class="hover-inside">
Mouse over here SHOULD trigger the counter.
</div>
</div>
<div id="delegateoverbox" class="hover-box"> <div id="delegateoverbox" class="hover-box">
<div class="hover-status"> <div class="hover-status">
<button>Activate</button> <button>Activate</button>
@ -115,8 +122,8 @@ $(function(){
.delegate("#delegateenterbox", "mouseleave", countOuts ); .delegate("#delegateenterbox", "mouseleave", countOuts );
$(this).remove(); $(this).remove();
}); });
$("#livebox button").click(function(){ $("#liveenterbox button").click(function(){
$("#livebox") $("#liveenterbox")
.data({ ins: 0, outs: 0 }) .data({ ins: 0, outs: 0 })
.live("mouseenter", countIns ) .live("mouseenter", countIns )
.live("mouseleave", countOuts ); .live("mouseleave", countOuts );
@ -130,6 +137,13 @@ $(function(){
.bind("mouseout", countOuts ); .bind("mouseout", countOuts );
$(this).remove(); $(this).remove();
}); });
$("#liveoverbox button").click(function(){
$("#liveoverbox")
.data({ ins: 0, outs: 0 })
.live("mouseover", countIns )
.live("mouseout", countOuts );
$(this).remove();
});
$("#delegateoverbox button").click(function(){ $("#delegateoverbox button").click(function(){
$(document) $(document)
.find("#delegateoverbox").data({ ins: 0, outs: 0 }).end() .find("#delegateoverbox").data({ ins: 0, outs: 0 }).end()