Merge branch 'master' of github.com:jquery/jquery

Conflicts: src/support.js
jquery · Apr 7, 2011 · 6832595 · 6832595
2 parents c1dcad6 + bbd9c77
commit 6832595
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/event.js b/src/event.js
@@ -850,7 +850,7 @@ function trigger( type, elem, args ) {
 }
 
 // Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
+if ( !jQuery.support.focusinBubbles ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 
 		// Attach a single capturing handler while someone wants focusin/focusout