From 0b6afcedd22aaffb96d3d45b9b220a16229e2f7c Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Thu, 23 Dec 2010 16:21:14 -0500 Subject: [PATCH 1/4] When a native browser event is bubbling up the DOM, make sure that the correct isDefaultPrevented value is reflected by jQuery's Event object. Fixes #7793. --- src/event.js | 6 ++++++ test/unit/event.js | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/src/event.js b/src/event.js index fd470e718..80e2af66b 100644 --- a/src/event.js +++ b/src/event.js @@ -600,6 +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===true ? true : + src.getPreventDefault ? src.getPreventDefault() : + src.returnValue===false) ? returnTrue : returnFalse; // Event type } else { this.type = src; diff --git a/test/unit/event.js b/test/unit/event.js index a647e5f3b..d0183f89d 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -295,6 +295,44 @@ test("live/delegate immediate propagation", function() { $p.undelegate( "click" ); }); +test("bind/delegate bubbling, isDefaultPrevented", function() { + expect(2); + var $anchor2 = jQuery( "#anchor2" ), + $main = jQuery( "#main" ), + fakeClick = function($jq) { + // Prefer a native click so we don't get jQuery simulated bubbling + if ( $jq[0].click ) { + $jq[0].click(); // IE + } + else if ( document.createEvent ) { + var e = document.createEvent( 'MouseEvents' ); + e.initEvent( "click", true, true ); + $jq[0].dispatchEvent(e); + } + else { + $jq.click(); + } + }; + $anchor2.click(function(e) { + e.preventDefault(); + }); + $main.delegate("#foo", "click", function(e) { + equals( e.isDefaultPrevented(), true, "isDefaultPrevented true passed to bubbled event" ); + }); + fakeClick( $anchor2 ); + $anchor2.unbind( "click" ); + $main.undelegate( "click" ); + $anchor2.click(function(e) { + // Let the default action occur + }); + $main.delegate("#foo", "click", function(e) { + equals( e.isDefaultPrevented(), false, "isDefaultPrevented false passed to bubbled event" ); + }); + fakeClick( $anchor2 ); + $anchor2.unbind( "click" ); + $main.undelegate( "click" ); +}); + test("bind(), iframes", function() { // events don't work with iframes, see #939 - this test fails in IE because of contentDocument var doc = jQuery("#loadediframe").contents(); From c9e8a95709e12c6838a312850ce645e96a53ff5d Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Fri, 24 Dec 2010 09:53:39 -0500 Subject: [PATCH 2/4] Simplify the check for isDefaultPrevented. --- src/event.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/event.js b/src/event.js index 80e2af66b..b61b11e64 100644 --- a/src/event.js +++ b/src/event.js @@ -602,10 +602,8 @@ jQuery.Event = function( 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===true ? true : - src.getPreventDefault ? src.getPreventDefault() : - src.returnValue===false) ? returnTrue : returnFalse; + this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false || + src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse; // Event type } else { this.type = src; From b8931f744859e598aad52140d8ca085e013ac798 Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Mon, 27 Dec 2010 12:43:48 -0500 Subject: [PATCH 3/4] Test for standard createEvent before IE-specific click method. Don't fallback to fake click; let's see which browsers fail, if any. --- test/unit/event.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/unit/event.js b/test/unit/event.js index d0183f89d..56bc64ff6 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -300,17 +300,14 @@ test("bind/delegate bubbling, isDefaultPrevented", function() { var $anchor2 = jQuery( "#anchor2" ), $main = jQuery( "#main" ), fakeClick = function($jq) { - // Prefer a native click so we don't get jQuery simulated bubbling - if ( $jq[0].click ) { - $jq[0].click(); // IE - } - else if ( document.createEvent ) { + // 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 ); $jq[0].dispatchEvent(e); } - else { - $jq.click(); + else if ( $jq[0].click ) { + $jq[0].click(); // IE } }; $anchor2.click(function(e) { From 007e2d152e10a8feffa347b5f328d2cb4bd45327 Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Sat, 15 Jan 2011 10:24:13 -0500 Subject: [PATCH 4/4] Update test case to feature-detect Opera's lack of defaultPrevented and skip the test for it. --- test/unit/event.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/unit/event.js b/test/unit/event.js index 56bc64ff6..d5d6790d4 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -314,7 +314,14 @@ test("bind/delegate bubbling, isDefaultPrevented", 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" );