Skip to content
Permalink
Browse files

Revert "Make sure that focusin/focusout bubbles in non-IE browsers." …

…This was causing problems with the focusin event, see: #7340.

This reverts commit 88068f8.

Conflicts:

	src/event.js
	test/unit/event.js
  • Loading branch information
jeresig committed Jan 21, 2011
1 parent dc2e731 commit 328a86f9a0d3f0907cc950f7543e34cb3efbda3f
Showing with 5 additions and 30 deletions.
  1. +5 −10 src/event.js
  2. +0 −20 test/unit/event.js
@@ -8,7 +8,6 @@ var rnamespaces = /\.(.*)$/,
fcleanup = function( nm ) {
return nm.replace(rescape, "\\$&");
},
focusCounts = { focusin: 0, focusout: 0 },
eventKey = "events";

/*
@@ -880,21 +879,17 @@ if ( document.addEventListener ) {
jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
jQuery.event.special[ fix ] = {
setup: function() {
if ( focusCounts[fix]++ === 0 ) {
document.addEventListener( orig, handler, true );
}
},
teardown: function() {
if ( --focusCounts[fix] === 0 ) {
document.removeEventListener( orig, handler, true );
}
this.addEventListener( orig, handler, true );
},
teardown: function() {
this.removeEventListener( orig, handler, true );
}
};

function handler( e ) {
e = jQuery.event.fix( e );
e.type = fix;
return jQuery.event.trigger( e, null, e.target );
return jQuery.event.handle.call( this, e );
}
});
}
@@ -1953,26 +1953,6 @@ test("window resize", function() {
ok( !jQuery._data(window, "__events__"), "Make sure all the events are gone." );
});

test("focusin bubbles", function() {
//create an input and focusin on it
var input = jQuery("<input/>"), order = 0;

input.prependTo("body");

jQuery("body").bind("focusin.focusinBubblesTest",function(){
equals(1,order++,"focusin on the body second")
});

input.bind("focusin.focusinBubblesTest",function(){
equals(0,order++,"focusin on the element first")
});

input[0].focus();
input.remove();

jQuery("body").unbind("focusin.focusinBubblesTest");
});

/*
test("jQuery(function($) {})", function() {
stop();

0 comments on commit 328a86f

Please sign in to comment.
You can’t perform that action at this time.