Fix #14180. Allow cross-frame use of focusin/out. Close jquerygh-1369.

markelog · Nov 13, 2013 · 1cecf64 · 1cecf64
1 parent b7f62ab
commit 1cecf64
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 7 deletions.
diff --git a/src/event.js b/src/event.js
@@ -726,21 +726,31 @@ jQuery.each({
 if ( !support.focusinBubbles ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
 				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
 			};
 
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
+				var doc = this.ownerDocument,
+					attaches = data_priv.access( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
 				}
+				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
 			},
 			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
+				var doc = this.ownerDocument,
+					attaches = data_priv.access( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					data_priv.remove( doc, fix );
+
+				} else {
+					data_priv.access( doc, fix, attaches );
 				}
 			}
 		};

diff --git a/test/data/event/focusinCrossFrame.html b/test/data/event/focusinCrossFrame.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>focusin event cross-frame (#14180)</title>
+
+	<script src="../../jquery.js"></script>
+</head>
+<body>
+	<input type="text" id="frame-input" />
+	<script>
+		// Call parent when this frame is fully loaded, it will mess with #frame-input
+		jQuery( window ).one( "load", function() {
+			window.parent.iframeCallback( document );
+		});
+	</script>
+</body>
+</html>
diff --git a/test/unit/event.js b/test/unit/event.js
@@ -2374,6 +2374,39 @@ test("fixHooks extensions", function() {
 	jQuery.event.fixHooks.click = saved;
 });
 
+testIframeWithCallback( "focusin from an iframe", "event/focusinCrossFrame.html", function( frameDoc ) {
+	expect(1);
+
+	var input = jQuery( frameDoc ).find( "#frame-input" );
+
+	if ( input.length ) {
+		// Create a focusin handler on the parent; shouldn't affect the iframe's fate
+		jQuery ( "body" ).on( "focusin.iframeTest", function() {
+			ok( false, "fired a focusin event in the parent document" );
+		});
+
+		input.on( "focusin", function() {
+			ok( true, "fired a focusin event in the iframe" );
+		});
+
+		// Avoid a native event; Chrome can't force focus to another frame
+		input.trigger( "focusin" );
+
+		// Must manually remove handler to avoid leaks in our data store
+		input.remove();
+
+		// Be sure it was removed; nothing should happen
+		input.trigger( "focusin" );
+
+		// Remove body handler manually since it's outside the fixture
+		jQuery( "body" ).off( "focusin.iframeTest" );
+
+	} else {
+		// Opera 12 (pre-Blink) doesn't select anything
+		ok( true, "SOFTFAIL: no focus event fired in the iframe" );
+	}
+});
+
 testIframeWithCallback( "jQuery.ready promise", "event/promiseReady.html", function( isOk ) {
 	expect(1);
 	ok( isOk, "$.when( $.ready ) works" );