diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2013-10-22 22:49:03 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2013-10-22 22:49:03 -0400 |
| commit | eca79fbf5b79d85d137a8eb207fcb1431af47d4e (patch) | |
| tree | 92ad7821287a06dcebf8d6858f0579e0bb26bded | |
| parent | 9b6f0745805941a6d7b7c16c02cf56ab00021c82 (diff) | |
| download | jquery-eca79fbf5b79d85d137a8eb207fcb1431af47d4e.tar.gz jquery-eca79fbf5b79d85d137a8eb207fcb1431af47d4e.zip | |
Revert "Fix #14180. Allow cross-frame use of focusin/out. Close gh-1369."
This reverts commit 9b6f0745805941a6d7b7c16c02cf56ab00021c82.
| -rw-r--r-- | src/event.js | 21 | ||||
| -rw-r--r-- | test/data/event/focusinCrossFrame.html | 18 | ||||
| -rw-r--r-- | test/unit/event.js | 27 |
3 files changed, 7 insertions, 59 deletions
diff --git a/src/event.js b/src/event.js index ce5b453d2..2fd702c63 100644 --- a/src/event.js +++ b/src/event.js @@ -727,29 +727,22 @@ jQuery.each({ if ( !support.focusinBubbles ) { jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - // Attach a single capturing handler on the document while someone wants focusin/focusout - var handler = function( event ) { + // Attach a single capturing handler while someone wants focusin/focusout + var attaches = 0, + handler = function( event ) { jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); }; jQuery.event.special[ fix ] = { setup: function() { - var doc = this.ownerDocument, - attaches = data_priv.access( doc, "focusCount" ); - - if ( !attaches ) { - doc.addEventListener( orig, handler, true ); + if ( attaches++ === 0 ) { + document.addEventListener( orig, handler, true ); } - data_priv.access( doc, "focusCount", ( attaches || 0 ) + 1 ); }, teardown: function() { - var doc = this.ownerDocument, - attaches = data_priv.access( doc, "focusCount" ) - 1; - - if ( !attaches ) { - doc.removeEventListener( orig, handler, true ); + if ( --attaches === 0 ) { + document.removeEventListener( orig, handler, true ); } - data_priv.access( doc, "focusCount", attaches ); } }; }); diff --git a/test/data/event/focusinCrossFrame.html b/test/data/event/focusinCrossFrame.html deleted file mode 100644 index 487f8de8f..000000000 --- a/test/data/event/focusinCrossFrame.html +++ /dev/null @@ -1,18 +0,0 @@ -<!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 index 21dda5a0f..26f219195 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -2434,33 +2434,6 @@ 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" ); - - // 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" ); -}); - testIframeWithCallback( "jQuery.ready promise", "event/promiseReady.html", function( isOk ) { expect(1); ok( isOk, "$.when( $.ready ) works" ); |