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

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

Browse source
This commit is contained in:
Dave Methvin 2011-04-05 21:42:58 -04:00
parent 3609bed9e7 612a908514
commit b5c7c507c1
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/event.js
View file

@ -1027,11 +1027,16 @@ 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(" ");
while ( (type = types[ i++ ]) != null ) {

39
test/unit/event.js
View file

@ -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 );