Fix for a selector speed regression (calling a simple selector many times resulted...

[jquery.git] / src / event / event.js

diff --git a/src/event/event.js b/src/event/event.js
index b13e5a0..23dbd6f 100644 (file)
--- 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 ]();
                        }
@@ -169,7 +161,7 @@ jQuery.event = {
                // Empty object is for triggered events with no data
                event = jQuery.event.fix( event || window.event || {} ); 
 
-               var c = this.$events && this.$events[event.type], args = [].slice.call( arguments, 1 );
+               var c = this.$events && this.$events[event.type], args = Array.prototype.slice.call( arguments, 1 );
                args.unshift( event );
 
                for ( var j in c ) {
@@ -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;
        }
@@ -586,8 +578,6 @@ jQuery.extend({
        }
 });
 
-new function(){
-
        /**
         * Bind a function to the scroll event of each matched element.
         *
@@ -984,18 +974,3 @@ new function(){
 
        // A fallback to window.onload, that will always work
        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);
-               }
-       });