only copy guid from handler to modifiedHandler if it does not already have one

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 6987300..4f63bae 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -66,7 +66,7 @@ jQuery.event = {
                        if ( special.add ) {
                                var modifiedHandler = special.add.call( elem, handler, data, namespaces );
                                if ( modifiedHandler && jQuery.isFunction( modifiedHandler ) ) {
-                                       modifiedHandler.guid = handler.guid;
+                                       modifiedHandler.guid = modifiedHandler.guid || handler.guid;
                                        handler = modifiedHandler;
                                }
                        }
@@ -601,7 +601,7 @@ jQuery.fn.extend({
 });
 
 function liveHandler( event ) {
-       var stop = true, elems = [];
+       var stop = true, elems = [], args = arguments;
 
        jQuery.each( jQuery.data( this, "events" ).live || [], function( i, fn ) {
                if ( fn.live === event.type ) {
@@ -619,7 +619,7 @@ function liveHandler( event ) {
        jQuery.each(elems, function() {
                event.currentTarget = this.elem;
                event.data = this.fn.data
-               if ( this.fn.call( this.elem, event, this.fn.selector ) === false ) {
+               if ( this.fn.apply( this.elem, args ) === false ) {
                        return (stop = false);
                }
        });