X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=30f1b03b1a8bfce4d954ca4a6ac754c07b11750d;hb=c73eadf59952f71f5c55fe9887f1f9e005fe95a4;hp=39ec527ce08284b0409f0b86b9ff61534a11b09a;hpb=04194554738f8e2676f5d7876f5b78b12dbc2679;p=jquery.git diff --git a/src/event.js b/src/event.js index 39ec527..30f1b03 100644 --- a/src/event.js +++ b/src/event.js @@ -49,10 +49,14 @@ jQuery.event = { if ( typeof jQuery == "undefined" || jQuery.event.triggered ) return val; - val = jQuery.event.handle.apply(elem, arguments); + val = jQuery.event.handle.apply(arguments.callee.elem, arguments); return val; }); + // Add elem as a property of the handle function + // This is to prevent a memory leak with non-native + // event in IE. + handle.elem = elem; // Handle multiple events seperated by a space // jQuery(...).bind("mouseover mouseout", fn); @@ -87,6 +91,9 @@ jQuery.event = { // Keep track of which events have been used, for global triggering jQuery.event.global[type] = true; }); + + // Nullify elem to prevent memory leaks in IE + elem = null; }, guid: 1, @@ -150,6 +157,8 @@ jQuery.event = { // Remove the expando if it's no longer used for ( ret in events ) break; if ( !ret ) { + var handle = jQuery.data( elem, "handle" ); + if ( handle ) handle.elem = null; jQuery.removeData( elem, "events" ); jQuery.removeData( elem, "handle" ); } @@ -263,18 +272,11 @@ jQuery.event = { }, fix: function(event) { - // Short-circuit if the event has already been fixed by jQuery.event.fix - if ( event[ expando ] ) - return event; - // store a copy of the original event object // and clone to set read-only properties var originalEvent = event; event = jQuery.extend({}, originalEvent); - // Mark the event as fixed by jQuery.event.fix - event[ expando ] = true; - // add preventDefault and stopPropagation since // they will not work on the clone event.preventDefault = function() { @@ -478,7 +480,7 @@ jQuery.extend({ } // Trigger any bound ready events - $(document).triggerHandler("ready"); + jQuery(document).triggerHandler("ready"); } } });