Commit 6832595c authored by jaubourg's avatar jaubourg

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

Conflicts:
	src/support.js
parents c1dcad69 bbd9c776
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment