Event: Allow triggerHandler(beforeunload)

Fixes #14791 (cherry picked from commit 06adf7c9) Conflicts: src/event.js

Event: Allow triggerHandler(beforeunload)
Fixes #14791 (cherry picked from commit 06adf7c9) Conflicts: src/event.js
93fdfa2d · Dave Methvin · 48837b92 · 93fdfa2d · 93fdfa2d · 93fdfa2d
Commit 93fdfa2d authored Mar 04, 2014 by Dave Methvin
Show whitespace changes
Inline Side-by-side

Showing with 26 additions and 2 deletions

event.js src/event.js +3 -2

triggerunload.html test/data/event/triggerunload.html +18 -0

event.js test/unit/event.js +5 -0

No files found.
--- a/src/event.js
+++ b/src/event.js
@@ -616,8 +616,9 @@ jQuery.event = {
 		beforeunload: {
 			postDispatch: function( event ) {
-				// Even when returnValue equals to undefined Firefox will still show alert
+				// Support: Firefox 20+
-				if ( event.result !== undefined ) {
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
 					event.originalEvent.returnValue = event.result;
 				}
 			}

--- a/test/data/event/triggerunload.html
+++ b/test/data/event/triggerunload.html
+<!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>
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -2522,6 +2522,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 ) {