Ticket #3096: event-extra.patch

test/unit/event.js

@@ -182 +182 @@
 });
 
 test("trigger(event, [data], [fn])", function() {
-    expect(67);
+    expect(72);
 
     var handler = function(event, a, b, c) {
         equals( event.type, "click", "check passed data" );
@@ -192 +192 @@
         return "test";
     };
 
-    var handler2 = function(a, b, c) {
+    var handler2 = function(event, a, b, c) {
+        equals( event.type, "click", "check passed data" );
         equals( a, 1, "check passed data" );
         equals( b, "2", "check passed data" );
         equals( c, "abc", "check passed data" );
         return false;
     };
 
-    var handler3 = function(a, b, c, v) {
+    var handler3 = function(event, a, b, c, v) {
+        equals( event.type, "click", "check passed data" );
         equals( a, 1, "check passed data" );
         equals( b, "2", "check passed data" );
         equals( c, "abc", "check passed data" );
@@ -207 +209 @@
         return "newVal";
     };
 
-    var handler4 = function(a, b, c, v) {
+    var handler4 = function(event, a, b, c, v) {
+        equals( event.type, "click", "check passed data" );
         equals( a, 1, "check passed data" );
         equals( b, "2", "check passed data" );
         equals( c, "abc", "check passed data" );

src/event.js

@@ -206 +206 @@
             if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
                 val = false;
 
-            // Extra functions don't get the custom event object
-            if ( event )
-                data.shift();
-
             // Handle triggering of extra function
             if ( extra && jQuery.isFunction( extra ) ) {
                 // call the extra function and tack the current return value on the end for possible inspection