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

Merging pull request 183 for #7793.

Browse source
This commit is contained in:
jeresig 2011-01-17 15:45:07 -05:00
parent ac2e731b2d 007e2d152e
commit 987c44bee4
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/event.js
View file

@ -603,7 +603,7 @@ jQuery.Event = function( src ) {
// Events bubbling up the document may have been marked as prevented // Events bubbling up the document may have been marked as prevented
// by a handler lower down the tree; reflect the correct value. // 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; src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
// Event type // Event type

16
test/unit/event.js
View file

@ -295,15 +295,15 @@ test("live/delegate immediate propagation", function() {
$p.undelegate( "click" ); $p.undelegate( "click" );
}); });
test("bind/delegate bubbling, isDefaultPrevented (Bug #7793)", function() { test("bind/delegate bubbling, isDefaultPrevented", function() {
expect(2); expect(2);
var $anchor2 = jQuery( "#anchor2" ), var $anchor2 = jQuery( "#anchor2" ),
$main = jQuery( "#main" ), $main = jQuery( "#main" ),
fakeClick = function($jq) { fakeClick = function($jq) {
// Use a native click so we don't get jQuery simulated bubbling // Use a native click so we don't get jQuery simulated bubbling
if ( document.createEvent ) { if ( document.createEvent ) {
var e = document.createEvent( "MouseEvents" ); var e = document.createEvent( 'MouseEvents' );
e.initEvent( "click", true, true ); e.initEvent( "click", true, true );
$jq[0].dispatchEvent(e); $jq[0].dispatchEvent(e);
} }
else if ( $jq[0].click ) { else if ( $jq[0].click ) {
@ -314,7 +314,15 @@ test("bind/delegate bubbling, isDefaultPrevented (Bug #7793)", function() {
e.preventDefault(); e.preventDefault();
}); });
$main.delegate("#foo", "click", function(e) { $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 ); fakeClick( $anchor2 );
$anchor2.unbind( "click" ); $anchor2.unbind( "click" );