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

diff --git a/src/event.js b/src/event.js
index ab7567081532fcedbdf8ccfd12d9e106fe1d030e..d830c4d98e05a98fe79f491e6794578ec5049ef9 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -7,7 +7,8 @@ var rnamespaces = /\.(.*)$/,
        rescape = /[^\w\s.|`]/g,
        fcleanup = function( nm ) {
                return nm.replace(rescape, "\\$&");
-       };
+       },
+       focusCounts = { focusin: 0, focusout: 0 };
 
 /*
  * A number of helper functions used for managing events.
@@ -855,17 +856,21 @@ if ( document.addEventListener ) {
        jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
                jQuery.event.special[ fix ] = {
                        setup: function() {
-                               this.addEventListener( orig, handler, true );
+                               if ( focusCounts[fix]++ === 0 ) {
+                                       document.addEventListener( orig, handler, true );
+                               }
                        }, 
                        teardown: function() { 
-                               this.removeEventListener( orig, handler, true );
+                               if ( --focusCounts[fix] === 0 ) {
+                                       document.removeEventListener( orig, handler, true );
+                               }
                        }
                };
 
                function handler( e ) { 
                        e = jQuery.event.fix( e );
                        e.type = fix;
-                       return jQuery.event.handle.call( this, e );
+                       return jQuery.event.trigger( e, null, e.target );
                }
        });
 }

diff --git a/test/unit/event.js b/test/unit/event.js
index a51659ca4699444fa3e56e475cc075a7f841d2e3..829ef7bcb49b8e2f00c0a1f76c0e039bf788e17b 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1843,7 +1843,21 @@ test("window resize", function() {
 
        ok( !jQuery(window).data("__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.appendTo(document.body);
+       jQuery(document.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(document.body).unbind("focusin.focusinBubblesTest");
+})
 /*
 test("jQuery(function($) {})", function() {
        stop();