Skip to content
Permalink
Browse files

Make sure that .die() with no args works. Fixes #5789.

  • Loading branch information
jeresig committed Jan 23, 2010
1 parent 8ea634f commit 3e286440d55749382a644ea97b4f0b2587779d65
Showing with 19 additions and 4 deletions.
  1. +3 −3 src/event.js
  2. +16 −1 test/unit/event.js
@@ -850,9 +850,9 @@ jQuery.each(["live", "die"], function( i, name ) {
data = undefined;
}

types = types.split( /\s+/ );
types = (types || "").split( /\s+/ );

while ( (type = types[ i++ ]) ) {
while ( (type = types[ i++ ]) != null ) {
type = type === "focus" ? "focusin" : // focus --> focusin
type === "blur" ? "focusout" : // blur --> focusout
type === "hover" ? types.push("mouseleave") && "mouseenter" : // hover support
@@ -934,7 +934,7 @@ function liveHandler( event ) {
}

function liveConvert( type, selector ) {
return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "&")].join(".");
return "live." + (type ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
}

jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
@@ -864,11 +864,26 @@ test(".live()/.die()", function() {
jQuery("#nothiddendiv div").die("click");
});

test("die all bound events", function(){
expect(1);

var count = 0;
var div = jQuery("div#nothiddendivchild");

div.live("click submit", function(){ count++; });
div.die();

div.trigger("click");
div.trigger("submit");

equals( count, 0, "Make sure no events were triggered." );
});

test("live with multiple events", function(){
expect(1);

var count = 0;
var div = jQuery("div#nothiddendivchild")
var div = jQuery("div#nothiddendivchild");

div.live("click submit", function(){ count++; });

0 comments on commit 3e28644

Please sign in to comment.
You can’t perform that action at this time.