X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=d59533f06e4bca4ad3140eb9d06ece09da3b8733;hb=dd5c26304af1c5f884ebf0baa5df28a2f8a8c4cc;hp=986322f793aaf4b9566aa3176e30a9922df609f3;hpb=5d36fe3210787009e15e05ad602525d0c2823b5c;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 986322f..d59533f 100644
--- a/src/event.js
+++ b/src/event.js
@@ -769,6 +769,10 @@ if ( !jQuery.support.changeBubbles ) {
 		},
 
 		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
+				return false;
+			}
+
 			for ( var type in changeFilters ) {
 				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
 			}
@@ -952,7 +956,14 @@ jQuery.each(["live", "die"], function( i, name ) {
 			}
 
 			preType = type;
-			type = (liveMap[ type ] || type) + namespaces;
+
+			if ( type === "focus" || type === "blur" ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
 
 			if ( name === "live" ) {
 				// bind live handler
@@ -977,7 +988,7 @@ function liveHandler( event ) {
 		events = jQuery.data( this, "events" );
 
 	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
-	if ( event.liveFired === this || !events || event.button && event.type === "click" ) {
+	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
 		return;
 	}