Skip to content
Permalink
Browse files

Merging pull request 183 for #7793.

  • Loading branch information
jeresig committed Jan 17, 2011
2 parents ac2e731 + 007e2d1 commit 987c44bee48557f693a59bc7ecc1bbe1718c428c
Showing with 13 additions and 5 deletions.
  1. +1 −1 src/event.js
  2. +12 −4 test/unit/event.js
@@ -603,7 +603,7 @@ jQuery.Event = function( src ) {

// Events bubbling up the document may have been marked as prevented
// by a handler lower down the tree; reflect the correct value.
this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;

// Event type
@@ -295,15 +295,15 @@ test("live/delegate immediate propagation", function() {
$p.undelegate( "click" );
});

test("bind/delegate bubbling, isDefaultPrevented (Bug #7793)", function() {
test("bind/delegate bubbling, isDefaultPrevented", function() {
expect(2);
var $anchor2 = jQuery( "#anchor2" ),
$main = jQuery( "#main" ),
fakeClick = function($jq) {
// Use a native click so we don't get jQuery simulated bubbling
if ( document.createEvent ) {
var e = document.createEvent( "MouseEvents" );
e.initEvent( "click", true, true );
var e = document.createEvent( 'MouseEvents' );
e.initEvent( "click", true, true );
$jq[0].dispatchEvent(e);
}
else if ( $jq[0].click ) {
@@ -314,7 +314,15 @@ test("bind/delegate bubbling, isDefaultPrevented (Bug #7793)", function() {
e.preventDefault();
});
$main.delegate("#foo", "click", function(e) {
equals( e.isDefaultPrevented(), true, "isDefaultPrevented true passed to bubbled event" );
var orig = e.originalEvent;

if ( typeof(orig.defaultPrevented) === "boolean" || typeof(orig.returnValue) === "boolean" || orig.getPreventDefault ) {
equals( e.isDefaultPrevented(), true, "isDefaultPrevented true passed to bubbled event" );

} else {
// Opera < 11 doesn't implement any interface we can use, so give it a pass
ok( true, "isDefaultPrevented not supported by this browser, test skipped" );
}
});
fakeClick( $anchor2 );
$anchor2.unbind( "click" );

0 comments on commit 987c44b

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