jquery event: from #2249, adding $.event.proxy to link event handlers, and implementi...

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index e08a085..5f0adff 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -26,10 +26,10 @@ jQuery.event = {
                        var fn = handler; 
 
                        // Create unique handler function, wrapped around original handler 
-                       handler = function() { 
+                       handler = this.proxy( fn, function() { 
                                // Pass arguments and context to original handler 
                                return fn.apply(this, arguments); 
-                       };
+                       });
 
                        // Store data in unique handler 
                        handler.data = data;
@@ -160,7 +160,7 @@ jQuery.event = {
 
        trigger: function(type, data, elem, donative, extra) {
                // Clone the incoming data, if any
-               data = jQuery.makeArray(data || []);
+               data = jQuery.makeArray(data);
 
                if ( type.indexOf("!") >= 0 ) {
                        type = type.slice(0, -1);
@@ -184,8 +184,16 @@ jQuery.event = {
                                event = !data[0] || !data[0].preventDefault;
                        
                        // Pass along a fake event
-                       if ( event )
-                               data.unshift( this.fix({ type: type, target: elem }) );
+                       if ( event ) {
+                               data.unshift({ 
+                                       type: type, 
+                                       target: elem, 
+                                       preventDefault: function(){}, 
+                                       stopPropagation: function(){}, 
+                                       timeStamp: +new Date
+                               });
+                               data[0][expando] = true; // no need to fix fake event
+                       }
 
                        // Enforce the right trigger type
                        data[0].type = type;
@@ -231,7 +239,7 @@ jQuery.event = {
 
        handle: function(event) {
                // returned undefined or false
-               var val, namespace, all, handlers;
+               var val, ret, namespace, all, handlers;
 
                event = arguments[0] = jQuery.event.fix( event || window.event );
 
@@ -253,28 +261,35 @@ jQuery.event = {
                                event.handler = handler;
                                event.data = handler.data;
                                
-                               val = handler.apply( this, arguments );
+                               ret = handler.apply( this, arguments );
+
+                               if ( val !== false )
+                                       val = ret;
+
+                               if ( ret === false ) {
+                                       event.preventDefault();
+                                       event.stopPropagation();
+                               }
                        }
                }
-               
-               if ( val === false ) {
-                       event.preventDefault();
-                       event.stopPropagation();
-               }
-
-               // Clean up added properties in IE to prevent memory leak
-               if (jQuery.browser.msie)
-                       event.target = event.preventDefault = event.stopPropagation =
-                               event.handler = event.data = null;
 
                return val;
        },
 
        fix: function(event) {
+               if ( event[expando] == true ) 
+                       return event;
+               
                // store a copy of the original event object 
-               // and clone to set read-only properties
+               // and "clone" to set read-only properties
                var originalEvent = event;
-               event = jQuery.extend({}, originalEvent);
+               event = { originalEvent: originalEvent };
+               var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
+               for ( var i=props.length; i; i-- )
+                       event[ props[i] ] = originalEvent[ props[i] ];
+               
+               // Mark it as fixed
+               event[expando] = true;
                
                // add preventDefault and stopPropagation since 
                // they will not work on the clone
@@ -302,7 +317,7 @@ jQuery.event = {
                                
                // check if target is a textnode (safari)
                if ( event.target.nodeType == 3 )
-                       event.target = originalEvent.target.parentNode;
+                       event.target = event.target.parentNode;
 
                // Add relatedTarget, if necessary
                if ( !event.relatedTarget && event.fromElement )
@@ -331,6 +346,12 @@ jQuery.event = {
                return event;
        },
        
+       proxy: function( fn, proxy ){
+               // Set the guid of unique handler to the same of original handler, so it can be removed 
+               proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
+               return proxy;//so proxy can be declared as an argument
+       },
+       
        special: {
                ready: {
                        setup: function() {
@@ -396,11 +417,12 @@ jQuery.fn.extend({
        },
        
        one: function( type, data, fn ) {
+               var one = jQuery.event.proxy( fn || data, function(event) {
+                       jQuery(this).unbind(event, one);
+                       return (fn || data).apply( this, arguments );
+               });
                return this.each(function(){
-                       jQuery.event.add( this, type, function(event) {
-                               jQuery(this).unbind(event);
-                               return (fn || data).apply( this, arguments);
-                       }, fn && data);
+                       jQuery.event.add( this, type, one, fn && data);
                });
        },
 
@@ -422,20 +444,24 @@ jQuery.fn.extend({
                return undefined;
        },
 
-       toggle: function() {
+       toggle: function( fn ) {
                // Save reference to arguments for access in closure
-               var args = arguments;
+               var args = arguments, i = 1;
 
-               return this.click(function(event) {
+               // link all the functions, so any of them can unbind this click handler
+               while( i < args.length )
+                       jQuery.event.proxy( fn, args[i++] );
+
+               return this.click( jQuery.event.proxy( fn, function(event) {
                        // Figure out which function to execute
-                       this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+                       this.lastToggle = ( this.lastToggle || 0 ) % i;
                        
                        // Make sure that clicks stop
                        event.preventDefault();
                        
                        // and execute the function
-                       return args[this.lastToggle].apply( this, arguments ) || false;
-               });
+                       return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+               }));
        },
 
        hover: function(fnOver, fnOut) {