mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
parent
3a68c114e3
commit
06adf7c95d
@ -583,7 +583,7 @@ jQuery.event = {
|
||||
|
||||
// Support: Firefox 20+
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
|
18
test/data/event/triggerunload.html
Normal file
18
test/data/event/triggerunload.html
Normal file
@ -0,0 +1,18 @@
|
||||
<!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>
|
@ -2434,6 +2434,11 @@ testIframeWithCallback( "Focusing iframe element", "event/focusElem.html", funct
|
||||
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
|
||||
if ( hasPHP ) {
|
||||
testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady.html", function( isOk ) {
|
||||
|
Loading…
Reference in New Issue
Block a user