Skip to content
Permalink
Browse files

Merge branch 'ticket_7883' of https://github.com/rwldrn/jquery into r…

…wldrn-ticket_7883
  • Loading branch information...
dmethvin committed Apr 6, 2011
2 parents 3609bed + 612a908 commit b5c7c507c1617ada4b47fd2973dc42c6543f9cf2
Showing with 45 additions and 1 deletion.
  1. +6 −1 src/event.js
  2. +39 −0 test/unit/event.js
@@ -1027,10 +1027,15 @@ jQuery.each(["live", "die"], function( i, name ) {
return this;
}

if ( jQuery.isFunction( data ) ) {
if ( jQuery.isFunction( data ) || data === false ) {
fn = data;
data = undefined;
}

if ( fn === false ) {
fn = returnFalse;
}


types = (types || "").split(" ");

@@ -550,6 +550,45 @@ test("bind(name, false), unbind(name, false)", function() {
jQuery("#main").unbind("click");
});

test("live(name, false), die(name, false)", function() {
expect(3);

var main = 0;
jQuery("#main").live("click", function(e){ main++; });
jQuery("#ap").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." );

main = 0;
jQuery("#ap").live("click", false);
jQuery("#ap").trigger("click");
equals( main, 0, "Verify that no bubble happened." );

main = 0;
jQuery("#ap").die("click", false);
jQuery("#ap").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." );
});

test("delegate(selector, name, false), undelegate(selector, name, false)", function() {
expect(3);

var main = 0;

jQuery("#main").delegate("#ap", "click", function(e){ main++; });
jQuery("#ap").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." );

main = 0;
jQuery("#ap").delegate("#groups", "click", false);
jQuery("#groups").trigger("click");
equals( main, 0, "Verify that no bubble happened." );

main = 0;
jQuery("#ap").undelegate("#groups", "click", false);
jQuery("#groups").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." );
});

test("bind()/trigger()/unbind() on plain object", function() {
expect( 7 );

0 comments on commit b5c7c50

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