Refactored the trigger code a little bit.

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

diff --git a/src/event/event.js b/src/event/event.js
index 63a8a7c..812d6f2 100644 (file)
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -74,27 +74,36 @@ jQuery.event = {
                data = jQuery.makeArray(data || []);
 
                // Handle a global trigger
-               if ( !element ) {
-                       var g = this.global[type];
-                       if ( g )
-                               for ( var i = 0, gl = g.length; i < gl; i++ )
-                                       this.trigger( type, data, g[i] );
+               if ( !element )
+                       jQuery.each( this.global[type] || [], function(){
+                               jQuery.event.trigger( type, data, this );
+                       });
 
                // Handle triggering a single element
-               } else if ( element["on" + type] ) {
-                       // Pass along a fake event
-                       data.unshift( this.fix({ type: type, target: element }) );
+               else {
+                       var handler = element["on" + type ], val,
+                               fn = jQuery.isFunction( element[ type ] );
+
+                       if ( handler ) {
+                               // Pass along a fake event
+                               data.unshift( this.fix({ type: type, target: element }) );
        
-                       // Trigger the event
-                       var val = element["on" + type].apply( element, data );
+                               // Trigger the event
+                               if ( (val = handler.apply( element, data )) !== false )
+                                       this.triggered = true;
+                       }
 
-                       if ( val !== false && jQuery.isFunction( element[ type ] ) )
+                       if ( fn && val !== false )
                                element[ type ]();
+
+                       this.triggered = false;
                }
        },
 
        handle: function(event) {
-               if ( typeof jQuery == "undefined" ) return false;
+               // 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;
 
                // Empty object is for triggered events with no data
                event = jQuery.event.fix( event || window.event || {} ); 
@@ -467,8 +476,9 @@ jQuery.extend({
                        // If there are functions bound, to execute
                        if ( jQuery.readyList ) {
                                // Execute all of them
-                               for ( var i = 0; i < jQuery.readyList.length; i++ )
-                                       jQuery.readyList[i].apply( document );
+                               jQuery.each( jQuery.readyList, function(){
+                                       this.apply( document );
+                               });
                                
                                // Reset the list of functions
                                jQuery.readyList = null;