Make liveHandler to use jQuery.lastCloser and speed up internal sorting.

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 0f976a0..fde5767 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -743,15 +743,15 @@ function liveHandler( event ) {
 
        jQuery.each( jQuery.data( this, "events" ).live || [], function( i, fn ) {
                if ( fn.live === event.type ) {
-                       var elem = jQuery( event.target ).closest( fn.selector )[0];
+                       var elem = jQuery( event.target ).closest( fn.selector, event.currentTarget )[0];
                        if ( elem ) {
-                               elems.push({ elem: elem, fn: fn });
+                               elems.push({ elem: elem, fn: fn, closer: jQuery.lastCloser });
                        }
                }
        });
 
        elems.sort(function( a, b ) {
-               return jQuery.data( a.elem, "closest" ) - jQuery.data( b.elem, "closest" );
+               return a.closer - b.closer;
        });
 
        jQuery.each(elems, function() {
@@ -822,7 +822,8 @@ function bindReady() {
                // ensure firing before onload,
                // maybe late but safe also for iframes
                document.attachEvent("onreadystatechange", function() {
-                       if ( document.readyState === "complete" ) {
+                       // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+                       if ( document.readyState === "complete" && document.body ) {
                                document.detachEvent( "onreadystatechange", arguments.callee );
                                jQuery.ready();
                        }
@@ -830,7 +831,8 @@ function bindReady() {
 
                // If IE and not an iframe
                // continually check to see if the document is ready
-               if ( document.documentElement.doScroll && window === window.top ) (function() {
+               // NOTE: DO NOT CHANGE TO ===, FAILS IN IE.
+               if ( document.documentElement.doScroll && window == window.top ) (function() {
                        if ( jQuery.isReady ) {
                                return;
                        }
@@ -853,9 +855,9 @@ function bindReady() {
        jQuery.event.add( window, "load", jQuery.ready );
 }
 
-jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-       "mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave," +
-       "change,select,submit,keydown,keypress,keyup,error").split(","), function( i, name ) {
+jQuery.each( ("blur focus load resize scroll unload click dblclick " +
+       "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+       "change select submit keydown keypress keyup error").split(" "), function( i, name ) {
 
        // Handle event binding
        jQuery.fn[ name ] = function( fn ) {