From: jeresig <jeresig@gmail.com>
Date: Mon, 17 Jan 2011 20:45:07 +0000 (-0500)
Subject: Merging pull request 183 for #7793.
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=987c44bee48557f693a59bc7ecc1bbe1718c428c

Merging pull request 183 for #7793.
---

987c44bee48557f693a59bc7ecc1bbe1718c428c
diff --cc src/event.js
index 675e5ff,b61b11e..34cd91b
--- a/src/event.js
+++ b/src/event.js
@@@ -600,12 -600,10 +600,12 @@@ jQuery.Event = function( src ) 
  	if ( src && src.type ) {
  		this.originalEvent = src;
  		this.type = src.type;
 +
  		// 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
  	} else {
  		this.type = src;
diff --cc test/unit/event.js
index b4672a8,d5d6790..80b7650
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@@ -314,7 -314,14 +314,15 @@@ test("bind/delegate bubbling, isDefault
  		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 {
++
++		} 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" );