Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "Fix #14180. Allow cross-frame use of focusin/out. Close gh-1369
…."

This reverts commit 9b6f074.
  • Loading branch information
dmethvin committed Oct 23, 2013
1 parent 9b6f074 commit eca79fb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 59 deletions.
21 changes: 7 additions & 14 deletions src/event.js
Expand Up @@ -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 );
}
};
});
Expand Down
18 changes: 0 additions & 18 deletions test/data/event/focusinCrossFrame.html

This file was deleted.

27 changes: 0 additions & 27 deletions test/unit/event.js
Expand Up @@ -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" );
Expand Down

0 comments on commit eca79fb

Please sign in to comment.