Changeset 5276

Timestamp:

04/22/08 05:23:55 (7 months ago)

Author:

brandon.aaron

Message:

Some small optimizations to the event module. jQuery.event.trigger over 200% faster in IE and less code. Thanks in large to Ariel Flesler.

Files:

• trunk/jquery/src/event.js (modified) (3 diffs)

trunk/jquery/src/event.js

@@ -42 +42 @@
         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(arguments.callee.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
@@ -200 +193 @@
                 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 (and on links since we don't call .click() for links)
@@ -238 +232 @@
     handle: function(event) {
         // returned undefined or false
-        var val;
-
-        // Empty object is for triggered events with no data
-        event = jQuery.event.fix( event || window.event || {} ); 
+        var val, namespace, all, handlers;
+
+        event = arguments[0] = jQuery.event.fix( event || window.event );
 
         // Namespaced event handlers
-        var parts = event.type.split(".");
-        event.type = parts[0];
-
-        var handlers = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
-        args.unshift( event );
+        namespace = event.type.split(".");
+        event.type = namespace[0];
+        namespace = namespace[1];
+        all = !namespace && !event.exclusive; //cache this now, all = true means, any handler
+
+        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] && !event.exclusive || handler.type == parts[1] ) {
-                var ret = handler.apply( this, args );
-
-                if ( val !== false )
-                    val = ret;
-
-                if ( ret === false ) {
-                    event.preventDefault();
-                    event.stopPropagation();
-                }
-            }
+            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;
+                
+                val = handler.apply( this, arguments );
+            }
+        }
+        
+        if ( val === false ) {
+            event.preventDefault();
+            event.stopPropagation();
         }