Complete overhaul of the Ajax test suite, it's now passing in all browsers. In order...

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

diff --git a/src/event/event.js b/src/event/event.js
index bea2cba..bb5f9d2 100644 (file)
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -64,19 +64,15 @@ jQuery.event = {
                        // And bind the global event handler to the element
                        if (element.addEventListener)
                                element.addEventListener(type, element.$handle, false);
-                       else if (element.attachEvent)
+                       else
                                element.attachEvent("on" + type, element.$handle);
                }
 
                // 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,
@@ -112,14 +108,10 @@ jQuery.event = {
                                if ( !ret ) {
                                        if (element.removeEventListener)
                                                element.removeEventListener(type, element.$handle, false);
-                                       else if (element.detachEvent)
+                                       else
                                                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,24 +127,28 @@ 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
                        data.unshift( this.fix({ type: type, target: element }) );
 
                        // Trigger the event
-                       if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false )
-                               this.triggered = true;
+                       if ( jQuery.isFunction( element.$handle ) )
+                               val = element.$handle.apply( element, data );
+                       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 ]();
+                       }
 
                        this.triggered = false;
                }
@@ -226,9 +222,9 @@ jQuery.event = {
 
                // Calculate pageX/Y if missing and clientX/Y available
                if ( event.pageX == null && event.clientX != null ) {
-                       var e = document.documentElement || document.body;
-                       event.pageX = event.clientX + e.scrollLeft;
-                       event.pageY = event.clientY + e.scrollTop;
+                       var e = document.documentElement, b = document.body;
+                       event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
+                       event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
                }
                        
                // Add which for key events
@@ -482,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;
@@ -539,10 +535,9 @@ jQuery.fn.extend({
                        f.apply( document, [jQuery] );
                        
                // Otherwise, remember the function for later
-               else {
+               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;
        }
@@ -955,7 +950,7 @@ new function(){
                // script does not exist if jQuery is loaded dynamically
                if ( script ) 
                        script.onreadystatechange = function() {
-                               if ( this.readyState != "complete" ) return;
+                               if ( document.readyState != "complete" ) return;
                                jQuery.ready();
                        };
        
@@ -983,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);
-               }
-       });