Skip to content

J
jquery
Commit 06adf7c9 authored by Dave Methvin's avatar Dave Methvin
Browse files
Options

Event: Allow triggerHandler(beforeunload) 

Fixes #14791
parent 3a68c114
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 1 deletion
src/event.js
View file @ 06adf7c9
...@@ -583,7 +583,7 @@ jQuery.event = { ...@@ -583,7 +583,7 @@ jQuery.event = {
// Support: Firefox 20+ // Support: Firefox 20+
// Firefox doesn't alert if the returnValue field is not set. // Firefox doesn't alert if the returnValue field is not set.
if ( event.result !== undefined ) { if ( event.result !== undefined && event.originalEvent ) {
event.originalEvent.returnValue = event.result; event.originalEvent.returnValue = event.result;
} }
} }
......
test/data/event/triggerunload.html 0 → 100644
View file @ 06adf7c9
<!doctype html>
<html>
<script src="../../jquery.js"></script>
<script>
var called = false,
error = false;
window.onerror = function() { error = true; };
jQuery( window ).on( "beforeunload", function( event ) {
called = true;
return "maybe";
}).on( "load", function( event ) {
$( window ).triggerHandler( "beforeunload" );
window.parent.iframeCallback( called && !error );
});
</script>
</html>
test/unit/event.js
View file @ 06adf7c9
...@@ -2434,6 +2434,11 @@ testIframeWithCallback( "Focusing iframe element", "event/focusElem.html", funct ...@@ -2434,6 +2434,11 @@ testIframeWithCallback( "Focusing iframe element", "event/focusElem.html", funct
ok( isOk, "Focused an element in an iframe" ); ok( isOk, "Focused an element in an iframe" );
}); });
testIframeWithCallback( "triggerHandler(onbeforeunload)", "event/triggerunload.html", function( isOk ) {
expect( 1 );
ok( isOk, "Triggered onbeforeunload without an error" );
});
// need PHP here to make the incepted IFRAME hang // need PHP here to make the incepted IFRAME hang
if ( hasPHP ) { if ( hasPHP ) {
testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady.html", function( isOk ) { testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady.html", function( isOk ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment