Ref #14180, let focusin/out work on non-element targets.

(cherry picked from commit c2aca17d45)

Conflicts:
	src/event.js
This commit is contained in:
Dave Methvin 2013-11-14 16:33:12 -05:00
parent 9ca87af44c
commit 5f325b1bee
2 changed files with 15 additions and 2 deletions

View File

@ -899,7 +899,7 @@ if ( !support.focusinBubbles ) {
jQuery.event.special[ fix ] = { jQuery.event.special[ fix ] = {
setup: function() { setup: function() {
var doc = this.ownerDocument, var doc = this.ownerDocument || this,
attaches = jQuery._data( doc, fix ); attaches = jQuery._data( doc, fix );
if ( !attaches ) { if ( !attaches ) {
@ -908,7 +908,7 @@ if ( !support.focusinBubbles ) {
jQuery._data( doc, fix, ( attaches || 0 ) + 1 ); jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
}, },
teardown: function() { teardown: function() {
var doc = this.ownerDocument, var doc = this.ownerDocument || this,
attaches = jQuery._data( doc, fix ) - 1; attaches = jQuery._data( doc, fix ) - 1;
if ( !attaches ) { if ( !attaches ) {

View File

@ -2462,6 +2462,19 @@ test("fixHooks extensions", function() {
jQuery.event.fixHooks.click = saved; jQuery.event.fixHooks.click = saved;
}); });
test( "focusin using non-element targets", function() {
expect( 2 );
jQuery( document ).on( "focusin", function( e ) {
ok( e.type === "focusin", "got a focusin event on a document" );
}).trigger( "focusin" ).off( "focusin" );
jQuery( window ).on( "focusin", function( e ) {
ok( e.type === "focusin", "got a focusin event on a window" );
}).trigger( "focusin" ).off( "focusin" );
});
testIframeWithCallback( "focusin from an iframe", "event/focusinCrossFrame.html", function( frameDoc ) { testIframeWithCallback( "focusin from an iframe", "event/focusinCrossFrame.html", function( frameDoc ) {
expect(1); expect(1);