X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=d0cacf6b582b174cab4540573e5566b14232aade;hb=5d033dba02fc1ffe1398cdaf0e9d402fc75e13f0;hp=007eb1c80bfe9abdf3d2cbc2f450f88e8a35b8f6;hpb=45e4a52cdd094134c4595b0ff017b7a9d6a8243c;p=jquery.git diff --git a/src/event.js b/src/event.js index 007eb1c..d0cacf6 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, @@ -102,9 +109,9 @@ jQuery.event = { if ( events ) { // Unbind all events for the element - if ( !types ) + if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") ) for ( var type in events ) - this.remove( elem, type ); + this.remove( elem, type + (types || "") ); else { // types is actually an event object here if ( types.type ) { @@ -134,7 +141,7 @@ jQuery.event = { // remove generic event handler if no more handlers exist for ( ret in events[type] ) break; if ( !ret ) { - if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(this, elem) === false ) { + if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) { if (elem.removeEventListener) elem.removeEventListener(type, jQuery.data(elem, "handle"), false); else if (elem.detachEvent) @@ -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" ); } @@ -160,6 +169,11 @@ jQuery.event = { // Clone the incoming data, if any data = jQuery.makeArray(data || []); + if ( type.indexOf("!") >= 0 ) { + type = type.slice(0, -1); + var exclusive = true; + } + // Handle a global trigger if ( !elem ) { // Only trigger if we've ever bound an event for it @@ -182,13 +196,15 @@ jQuery.event = { // Enforce the right trigger type data[0].type = type; + if ( exclusive ) + data[0].exclusive = true; // Trigger the event if ( jQuery.isFunction( jQuery.data(elem, "handle") ) ) val = jQuery.data(elem, "handle").apply( elem, data ); - // Handle triggering native .onfoo handlers - if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) + // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links) + if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) val = false; // Extra functions don't get the custom event object @@ -196,9 +212,9 @@ jQuery.event = { data.shift(); // Handle triggering of extra function - if ( extra ) { + if ( extra && jQuery.isFunction( extra ) ) { // call the extra function and tack the current return value on the end for possible inspection - var ret = extra.apply( elem, data.concat( val ) ); + ret = extra.apply( elem, val == null ? data : data.concat( val ) ); // if anything is returned, give it precedence and have it overwrite the previous value if (ret !== undefined) val = ret; @@ -241,7 +257,7 @@ jQuery.event = { args[0].data = handler.data; // Filter the functions by class - if ( !parts[1] || handler.type == parts[1] ) { + if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) { var ret = handler.apply( this, args ); if ( val !== false ) @@ -305,7 +321,7 @@ jQuery.event = { } // Add which for key events - if ( !event.which && (event.charCode || event.keyCode) ) + if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) event.which = event.charCode || event.keyCode; // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) @@ -323,45 +339,12 @@ jQuery.event = { special: { ready: { setup: function() { - var handler = jQuery.event.special.ready.handler; - - // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", handler, false ); - - // If Safari or IE is used - // Continually check to see if the document is ready - if ((jQuery.browser.msie && window == top) || jQuery.browser.safari ) (function(){ - try { - // If IE is used, use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - if ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" ) - document.documentElement.doScroll("left"); - } catch( error ) { - setTimeout( arguments.callee, 0 ); - return; - } - - // and execute any waiting functions - handler(); - })(); - - // A fallback to window.onload, that will always work - jQuery.event.add( window, "load", handler ); + // Make sure the ready event is setup + bindReady(); + return; }, - teardown: function() {return;}, - - handler: function() { - // Make sure that the DOM is not already loaded - if ( !jQuery.isReady ) { - // Remember that the DOM is ready - jQuery.isReady = true; - jQuery(document).triggerHandler("ready"); - jQuery(document).unbind("ready"); - } - } + teardown: function() { return; } }, mouseenter: { @@ -462,14 +445,116 @@ jQuery.fn.extend({ hover: function(fnOver, fnOut) { return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut); + }, + + ready: function(fn) { + // Attach the listeners + bindReady(); + + // If the DOM is already ready + if ( jQuery.isReady ) + // Execute the function immediately + fn.call( document, jQuery ); + + // Otherwise, remember the function for later + else + // Add the function to the wait list + jQuery.readyList.push( function() { return fn.call(this, jQuery); } ); + + return this; } }); jQuery.extend({ - isReady: false + isReady: false, + readyList: [], + // Handle when the DOM is ready + ready: function() { + // Make sure that the DOM is not already loaded + if ( !jQuery.isReady ) { + // Remember that the DOM is ready + jQuery.isReady = true; + + // If there are functions bound, to execute + if ( jQuery.readyList ) { + // Execute all of them + jQuery.each( jQuery.readyList, function(){ + this.apply( document ); + }); + + // Reset the list of functions + jQuery.readyList = null; + } + + // Trigger any bound ready events + jQuery(document).triggerHandler("ready"); + } + } }); -jQuery.each( ("blur,focus,load,ready,resize,scroll,unload,click,dblclick," + +var readyBound = false; + +function bindReady(){ + if ( readyBound ) return; + readyBound = true; + + // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event + if ( document.addEventListener && !jQuery.browser.opera) + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", jQuery.ready, false ); + + // If IE is used and is not in a frame + // Continually check to see if the document is ready + if ( jQuery.browser.msie && window == top ) (function(){ + if (jQuery.isReady) return; + try { + // If IE is used, use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + document.documentElement.doScroll("left"); + } catch( error ) { + setTimeout( arguments.callee, 0 ); + return; + } + // and execute any waiting functions + jQuery.ready(); + })(); + + if ( jQuery.browser.opera ) + document.addEventListener( "DOMContentLoaded", function () { + if (jQuery.isReady) return; + for (var i = 0; i < document.styleSheets.length; i++) + if (document.styleSheets[i].disabled) { + setTimeout( arguments.callee, 0 ); + return; + } + // and execute any waiting functions + jQuery.ready(); + }, false); + + if ( jQuery.browser.safari ) { + var numStyles; + (function(){ + if (jQuery.isReady) return; + if ( document.readyState != "loaded" && document.readyState != "complete" ) { + setTimeout( arguments.callee, 0 ); + return; + } + if ( numStyles === undefined ) + numStyles = jQuery("style, link[rel=stylesheet]").length; + if ( document.styleSheets.length != numStyles ) { + setTimeout( arguments.callee, 0 ); + return; + } + // and execute any waiting functions + jQuery.ready(); + })(); + } + + // A fallback to window.onload, that will always work + jQuery.event.add( window, "load", jQuery.ready ); +} + +jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," + "mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + "submit,keydown,keypress,keyup,error").split(","), function(i, name){ @@ -485,7 +570,7 @@ var withinElement = function(event, elem) { // Check if mouse(over|out) are still within the same parent element var parent = event.relatedTarget; // Traverse up the tree - while ( parent && parent != elem ) try { parent = parent.parentNode } catch(error) { parent = elem; }; + while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; } // Return true if we actually just moused on to a sub-element return parent == elem; };