X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=59fff51da8f25313c42839afb746a1cf0260cc48;hb=2b05e24993c48f3b9c2cb9857090dc4b218b8834;hp=b13e5a02f36d2b01ba1e72f41b64d788d6a5a562;hpb=24463a04ce5612f4007263f9af0d1e4d7568ed9a;p=jquery.git diff --git a/src/event/event.js b/src/event/event.js index b13e5a0..59fff51 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -71,12 +71,8 @@ jQuery.event = { // Add the function to the element's handler list handlers[handler.guid] = handler; - // Remember the function in a global list (for triggering) - if (!this.global[type]) - this.global[type] = []; - // Only add the element to the global list once - if (jQuery.inArray(element, this.global[type]) == -1) - this.global[type].push( element ); + // Keep track of which events have been used, for global triggering + this.global[type] = true; }, guid: 1, @@ -116,10 +112,6 @@ jQuery.event = { element.detachEvent("on" + type, element.$handle); ret = null; delete events[type]; - - // Remove element from the global event type cache - while ( this.global[type] && ( (index = jQuery.inArray(element, this.global[type])) >= 0 ) ) - delete this.global[type][index]; } } @@ -135,13 +127,13 @@ jQuery.event = { data = jQuery.makeArray(data || []); // Handle a global trigger - if ( !element ) - jQuery.each( this.global[type] || [], function(){ - jQuery.event.trigger( type, data, this ); - }); + if ( !element ) { + // Only trigger if we've ever bound an event for it + if ( this.global[type] ) + jQuery("*").trigger(type, data); // Handle triggering a single element - else { + } else { var val, ret, fn = jQuery.isFunction( element[ type ] || null ); // Pass along a fake event @@ -153,7 +145,7 @@ jQuery.event = { if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false ) val = false; - if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) { + if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) { this.triggered = true; element[ type ](); } @@ -204,14 +196,14 @@ jQuery.event = { event.preventDefault = function() { // if preventDefault exists run it on the original event if (originalEvent.preventDefault) - return originalEvent.preventDefault(); + originalEvent.preventDefault(); // otherwise set the returnValue property of the original event to false (IE) originalEvent.returnValue = false; }; event.stopPropagation = function() { // if stopPropagation exists run it on the original event if (originalEvent.stopPropagation) - return originalEvent.stopPropagation(); + originalEvent.stopPropagation(); // otherwise set the cancelBubble property of the original event to true (IE) originalEvent.cancelBubble = true; }; @@ -486,7 +478,7 @@ jQuery.fn.extend({ var p = e.relatedTarget; // Traverse up the tree - while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; }; + while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; }; // If we actually just moused on to a sub-element, ignore it if ( p == this ) return false; @@ -545,7 +537,7 @@ jQuery.fn.extend({ // Otherwise, remember the function for later else // Add the function to the wait list - jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } ); + jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } ); return this; } @@ -986,16 +978,3 @@ new function(){ jQuery.event.add( window, "load", jQuery.ready ); }; - -// Clean up after IE to avoid memory leaks -if (jQuery.browser.msie) - jQuery(window).one("unload", function() { - var global = jQuery.event.global; - for ( var type in global ) { - var els = global[type], i = els.length; - if ( i && type != 'unload' ) - do - els[i-1] && jQuery.event.remove(els[i-1], type); - while (--i); - } - });