Changeset 5352

Timestamp:

04/29/08 22:06:54 (7 months ago)

Author:

aflesler

Message:

jquery event: from #2249, adding $.event.proxy to link event handlers, and implementing it on $.event.add, $.fn._toggle and $.fn.one.
It also fixes a bug in $.fn.one that was unbinding ALL the existing handlers.

Files:

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

trunk/jquery/src/event.js

@@ -27 +27 @@
 
             // 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 
@@ -347 +347 @@
     },
     
+    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: {
@@ -412 +418 @@
     
     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);
         });
     },
@@ -438 +445 @@
     },
 
-    toggle: function() {
+    toggle: function( fn ) {
         // Save reference to arguments for access in closure
-        var args = arguments;
-
-        return this.click(function(event) {
+        var args = arguments, i = 1;
+
+        // 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 = ( this.lastToggle || 0 ) % args.length;
+            this.lastToggle = ( this.lastToggle || 0 ) % i;
             
             // Make sure that clicks stop
@@ -451 +462 @@
             // and execute the function
             return args[ this.lastToggle++ ].apply( this, arguments ) || false;
-        });
+        }));
     },