X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=2d9bdc27a8482fa2ce5094ebf394002af686892f;hb=b84b997ea4be31dd1fdcc63136811dcd324dec68;hp=fa8be8d2f576de60d9f35ac049c5a550e0fcc69c;hpb=a7dfbb55d9e4be6bbf096abb0e06e32086476a96;p=jquery.git diff --git a/src/event.js b/src/event.js index fa8be8d..2d9bdc2 100644 --- a/src/event.js +++ b/src/event.js @@ -41,18 +41,15 @@ jQuery.event = { // Init the element's event structure var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}), handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){ - // returned undefined or false - var val; - // Handle the second event of a trigger and when // an event is called after a page has unloaded - if ( typeof jQuery == "undefined" || jQuery.event.triggered ) - return val; - - val = jQuery.event.handle.apply(elem, arguments); - - return val; + if ( typeof jQuery != "undefined" && !jQuery.event.triggered ) + return jQuery.event.handle.apply(arguments.callee.elem, arguments); }); + // 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 +84,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 +102,9 @@ jQuery.event = { if ( events ) { // Unbind all events for the element - if ( types == undefined ) + 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 ) { @@ -150,6 +150,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" ); } @@ -158,7 +160,12 @@ jQuery.event = { trigger: function(type, data, elem, donative, extra) { // Clone the incoming data, if any - data = jQuery.makeArray(data || []); + data = jQuery.makeArray(data); + + if ( type.indexOf("!") >= 0 ) { + type = type.slice(0, -1); + var exclusive = true; + } // Handle a global trigger if ( !elem ) { @@ -178,17 +185,20 @@ jQuery.event = { // Pass along a fake event if ( event ) - data.unshift( this.fix({ type: type, target: elem }) ); + data.unshift( { type: type, target: elem } ); // 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 ); + // Trigger the event, it is assumed that "handle" is a function + var handle = jQuery.data(elem, "handle"); + if ( handle ) + val = 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 @@ -198,7 +208,7 @@ jQuery.event = { // Handle triggering of extra function 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; @@ -221,28 +231,29 @@ jQuery.event = { handle: function(event) { // returned undefined or false - var val; + var val, ret, namespace, all, handlers; - // Empty object is for triggered events with no data - event = jQuery.event.fix( event || window.event || {} ); + event = arguments[0] = jQuery.event.fix( event || window.event ); // Namespaced event handlers - var parts = event.type.split("."); - event.type = parts[0]; + namespace = event.type.split("."); + event.type = namespace[0]; + namespace = namespace[1]; + all = !namespace && !event.exclusive; //cache this now, all = true means, any handler - var handlers = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 ); - args.unshift( event ); + handlers = ( jQuery.data(this, "events") || {} )[event.type]; for ( var j in handlers ) { var handler = handlers[j]; - // Pass in a reference to the handler function itself - // So that we can later remove it - args[0].handler = handler; - args[0].data = handler.data; // Filter the functions by class - if ( !parts[1] || handler.type == parts[1] ) { - var ret = handler.apply( this, args ); + if ( all || handler.type == namespace ) { + // Pass in a reference to the handler function itself + // So that we can later remove it + event.handler = handler; + event.data = handler.data; + + ret = handler.apply( this, arguments ); if ( val !== false ) val = ret; @@ -257,23 +268,22 @@ jQuery.event = { // Clean up added properties in IE to prevent memory leak if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = - event.handler = event.data = null; + event.handler = event.data = event[expando] = null; return val; }, fix: function(event) { - // Short-circuit if the event has already been fixed by jQuery.event.fix - if ( event[ expando ] ) + if ( event[expando] == true ) 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; + // Mark it as fixed + event[expando] = true; // add preventDefault and stopPropagation since // they will not work on the clone @@ -292,6 +302,9 @@ jQuery.event = { originalEvent.cancelBubble = true; }; + // Fix timeStamp + event.timeStamp = event.timeStamp || +new Date; + // Fix target property, if necessary if ( !event.target ) event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either @@ -312,7 +325,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) @@ -478,7 +491,7 @@ jQuery.extend({ } // Trigger any bound ready events - $(document).triggerHandler("ready"); + jQuery(document).triggerHandler("ready"); } } }); @@ -489,27 +502,58 @@ function bindReady(){ if ( readyBound ) return; readyBound = true; - // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) + // 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 Safari or IE is used + // If IE is used and is not in a frame // Continually check to see if the document is ready - if (jQuery.browser.msie || jQuery.browser.safari ) (function(){ + 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/ - if ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" ) - document.documentElement.doScroll("left"); + document.documentElement.doScroll("left"); } catch( error ) { - return setTimeout( arguments.callee, 0 ); + 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 ); } @@ -530,7 +574,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; };