diff --git a/src/event.js b/src/event.js index 9bc875e24..8722268a8 100644 --- a/src/event.js +++ b/src/event.js @@ -601,23 +601,29 @@ jQuery.event = { } }, + // Piggyback on a donor event to simulate a different one simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. var e = jQuery.extend( new jQuery.Event(), event, { type: type, isSimulated: true + // Previously, `originalEvent: {}` was set here, so stopPropagation call + // would not be triggered on donor event, since in our own + // jQuery.event.stopPropagation function we had a check for existence of + // originalEvent.stopPropagation method, so, consequently it would be a noop. + // + // But now, this "simulate" function is used only for events + // for which stopPropagation() is noop, so there is no need for that anymore. + // + // For the compat branch though, guard for "click" and "submit" + // events is still used, but was moved to jQuery.event.stopPropagation function + // because `originalEvent` should point to the original event for the constancy + // with other events and for more focused logic } ); - // This prevents stopPropagation(), stopImmediatePropagation(), and preventDefault() from - // preventing default on the donor event. - delete e.originalEvent; - if ( bubble ) { jQuery.event.trigger( e, null, elem ); } else { diff --git a/test/unit/event.js b/test/unit/event.js index 981e6702f..ba3d9481a 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -2694,35 +2694,68 @@ test( "preventDefault() on focusin does not throw exception", function( assert ) .focus(); } ); -test( "jQuery.event.simulate() event has no originalEvent", function( assert ) { - expect( 1 ); - - var done = assert.async(), - input = jQuery( "" ) - .on( "click", function( event ) { - assert.strictEqual( "originalEvent" in event, false, - "originalEvent not present on simulated event" ); - done(); - } ); - - jQuery.event.simulate( "click", input[ 0 ], new jQuery.Event(), true ); -} ); - test( "Donor event interference", function( assert ) { - assert.expect( 4 ); + assert.expect( 10 ); - jQuery( "#donor-outer" ).on( "click", function() { + var html = "