Reverted the change that I made in #1320.

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

diff --git a/src/event/event.js b/src/event/event.js
index 3c5a119..3df1ae7 100644 (file)
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -134,10 +134,13 @@ jQuery.event = {
 
                // Handle triggering a single element
                } else {
-                       var val, ret, fn = jQuery.isFunction( element[ type ] || null );
+                       var val, ret, fn = jQuery.isFunction( element[ type ] || null ),
+                               // Check to see if we need to provide a fake event, or not
+                               evt = !data[0] || !data[0].preventDefault;
                        
                        // Pass along a fake event
-                       data.unshift( this.fix({ type: type, target: element }) );
+                       if ( evt )
+                               data.unshift( this.fix({ type: type, target: element }) );
 
                        // Trigger the event
                        if ( jQuery.isFunction( element.$handle ) )
@@ -147,6 +150,10 @@ jQuery.event = {
                        if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
                                val = false;
 
+                       // Extra functions don't get the custom event object
+                       if ( evt )
+                               data.shift();
+
                        // Handle triggering of extra function
                        if ( extra && extra.apply( element, data ) === false )
                                val = false;
@@ -975,7 +982,7 @@ function bindReady(){
                // script does not exist if jQuery is loaded dynamically
                if ( script ) 
                        script.onreadystatechange = function() {
-                               if ( document.readyState != "complete" ) return;
+                               if ( this.readyState != "complete" ) return;
                                jQuery.ready();
                        };