library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '8777' of https://github.com/rwldrn/jquery into rwldrn-8777

Browse Source 
Conflicts:
	src/event.js
This commit is contained in:
jeresig 2011-04-11 12:13:04 -04:00
commit 094c48e0c5
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/event.js
View File

@ -1033,6 +1033,14 @@ jQuery.each(["live", "die"], function( i, name ) {
return this; return this;
} }
if ( name === "die" && !types &&
origSelector && origSelector[0] === "." ) {
context.unbind( origSelector );
return this;
}
if ( data === false || jQuery.isFunction( data ) ) { if ( data === false || jQuery.isFunction( data ) ) {
fn = data || returnFalse; fn = data || returnFalse;
data = undefined; data = undefined;

21
test/unit/event.js
View File

@ -2022,6 +2022,27 @@ test("delegate with submit", function() {
jQuery(document).undelegate(); jQuery(document).undelegate();
}); });
test("undelegate() with only namespaces", function(){
expect(2);
var $delegate = jQuery("#liveHandlerOrder"),
count = 0;
$delegate.delegate("a", "click.ns", function(e) {
count++;
});
jQuery("a", $delegate).eq(0).trigger("click.ns");
equals( count, 1, "delegated click.ns");
$delegate.undelegate(".ns");
jQuery("a", $delegate).eq(1).trigger("click.ns");
equals( count, 1, "no more .ns after undelegate");
});
test("Non DOM element events", function() { test("Non DOM element events", function() {
expect(1); expect(1);