Make sure that we're doing proper focus bubble testing. Also simplified the logic...

diff --git a/src/event.js b/src/event.js
index d9401c99e743ff58c650cf4e57aeb83bad5f27aa..c2d74763cb673ea133c2ffa92074b92012a71942 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -674,36 +674,26 @@ function trigger( type, elem, args ) {
 }
 
 // Create "bubbling" focus and blur events
-jQuery.each({
-       focus: "focusin",
-       blur: "focusout"
-}, function( orig, fix ){
-       var event = jQuery.event,
-               handle = event.handle;
-       
-       function ieHandler() { 
-               arguments[0].type = orig;
-               return handle.apply(this, arguments);
-       }
+if ( !jQuery.support.focusBubbles ) {
 
-       event.special[orig] = {
-               setup:function() {
-                       if ( this.addEventListener ) {
-                               this.addEventListener( orig, handle, true );
-                       } else {
-                               event.add( this, fix, ieHandler );
-                       }
+jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ){
+       event.special[ orig ] = {
+               setup: function() {
+                       jQuery.event.add( this, fix, ieHandler );
                }, 
-               teardown:function() { 
-                       if ( this.removeEventListener ) {
-                               this.removeEventListener( orig, handle, true );
-                       } else {
-                               event.remove( this, fix, ieHandler );
-                       }
+               teardown: function() { 
+                       jQuery.event.remove( this, fix, ieHandler );
                }
        };
+
+       function ieHandler() { 
+               arguments[0].type = orig;
+               return jQuery.event.handle.apply(this, arguments);
+       }
 });
 
+}
+
 jQuery.fn.extend({
        // TODO: make bind(), unbind() and one() DRY!
        bind: function( type, data, fn, thisObject ) {

diff --git a/src/support.js b/src/support.js
index ad8566d8bd047ab106d5f5d4b48bb3f9636c0f1f..9d5558f396a81864b269e0fd8d76b0c326833ed4 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -109,6 +109,7 @@
        
        jQuery.support.submitBubbles = eventSupported("submit");
        jQuery.support.changeBubbles = eventSupported("change");
+       jQuery.support.focusBubbles = eventSupported("focus");
 
        // release memory in IE
        root = script = div = all = a = null;