deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made it so that you can bind a single function to multiple .live() selectors. Additionally, simplified the proxy code to provide a default proxy function.

Browse source 
Fixes #3787.
This commit is contained in:
John Resig 2009-01-09 22:10:42 +00:00
parent eced38a30d
commit d12e8a34e6
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/event.js
View file

@ -26,10 +26,7 @@ jQuery.event = {
var fn = handler; var fn = handler;
// Create unique handler function, wrapped around original handler // Create unique handler function, wrapped around original handler
handler = this.proxy( fn, function() { handler = this.proxy( fn );
// Pass arguments and context to original handler
return fn.apply(this, arguments);
});
// Store data in unique handler // Store data in unique handler
handler.data = data; handler.data = data;
@ -334,6 +331,7 @@ jQuery.event = {
}, },
proxy: function( fn, proxy ){ proxy: function( fn, proxy ){
proxy = proxy || function(){ return fn.apply(this, arguments); };
// Set the guid of unique handler to the same of original handler, so it can be removed // 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++; proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
// So proxy can be declared as an argument // So proxy can be declared as an argument
@ -362,7 +360,7 @@ jQuery.event = {
remove++; remove++;
}); });
if ( remove <= 1 ) if ( remove < 1 )
jQuery.event.remove( this, namespaces[0], liveHandler ); jQuery.event.remove( this, namespaces[0], liveHandler );
} }
} }
@ -546,12 +544,16 @@ jQuery.fn.extend({
}, },
live: function( type, fn ){ live: function( type, fn ){
jQuery(document).bind( liveConvert(type, this.selector), this.selector, fn ); var proxy = jQuery.event.proxy( fn );
proxy.guid += this.selector;
jQuery(document).bind( liveConvert(type, this.selector), this.selector, proxy );
return this; return this;
}, },
die: function( type, fn ){ die: function( type, fn ){
jQuery(document).unbind( liveConvert(type, this.selector), fn ); jQuery(document).unbind( liveConvert(type, this.selector), fn ? { guid: fn.guid + this.selector } : null );
return this; return this;
} }
}); });

27
test/unit/event.js
View file

@ -474,7 +474,7 @@ test("toggle(Function, Function, ...)", function() {
}); });
test(".live()/.die()", function() { test(".live()/.die()", function() {
expect(30); expect(34);
var submit = 0, div = 0, livea = 0, liveb = 0; var submit = 0, div = 0, livea = 0, liveb = 0;
@ -550,6 +550,31 @@ test(".live()/.die()", function() {
jQuery("#anchor2").trigger("click"); jQuery("#anchor2").trigger("click");
equals( window.location.hash, hash, "e.preventDefault() worked" ); equals( window.location.hash, hash, "e.preventDefault() worked" );
jQuery("#anchor2").die("click"); jQuery("#anchor2").die("click");
// Test binding the same handler to multiple points
var called = 0;
function callback(){ called++; return false; }
jQuery("#nothiddendiv").live("click", callback);
jQuery("#anchor2").live("click", callback);
jQuery("#nothiddendiv").trigger("click");
equals( called, 1, "Verify that only one click occurred." );
jQuery("#anchor2").trigger("click");
equals( called, 2, "Verify that only one click occurred." );
// Make sure that only one callback is removed
jQuery("#anchor2").die("click", callback);
jQuery("#nothiddendiv").trigger("click");
equals( called, 3, "Verify that only one click occurred." );
jQuery("#anchor2").trigger("click");
equals( called, 3, "Verify that only one click occurred." );
// Cleanup
jQuery("#nothiddendiv").die("click", callback);
}); });
/* /*