X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=02349984abcdbc84a13acf124693d3300c634f4b;hb=8e53f7b5d6716e60d8c8ea7e167f2b187aae9d89;hp=6871327d144955107a10923395177776216f4633;hpb=5a0ac24e35c07fe4be22df828e6b909fe65237b9;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 6871327..0234998 100644
--- a/src/event.js
+++ b/src/event.js
@@ -755,7 +755,6 @@ jQuery.each(["bind", "one"], function( i, name ) {
 			for ( var key in type ) {
 				this[ name ](key, data, type[key], fn);
 			}
-
 			return this;
 		}
 		
@@ -770,17 +769,11 @@ jQuery.each(["bind", "one"], function( i, name ) {
 			return fn.apply( this, arguments );
 		}) : fn;
 
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn, thisObject );
-
-		} else {
-			// Deprecated: Please don't expect an empty jQuery set to bind to document
-			(!this.selector && !this.context ? jQuery(document) : this).each(function() {
+		return type === "unload" && name !== "one" ?
+			this.one( type, data, fn, thisObject ) :
+			this.each(function() {
 				jQuery.event.add( this, type, handler, data );
 			});
-		}
-
-		return this;
 	};
 });
 
@@ -794,20 +787,14 @@ jQuery.fn.extend({
 			return this;
 		}
 
-		// Deprecated: Please don't expect an empty jQuery set to bind to document
-		(!this.selector && !this.context ? jQuery(document) : this).each(function() {
+		return this.each(function() {
 			jQuery.event.remove( this, type, fn );
 		});
-
-		return this;
 	},
 	trigger: function( type, data ) {
-		// Deprecated: Please don't expect an empty jQuery set to bind to document
-		(!this.selector && !this.context ? jQuery(document) : this).each(function() {
+		return this.each(function() {
 			jQuery.event.trigger( type, data, this );
 		});
-
-		return this;
 	},
 
 	triggerHandler: function( type, data ) {
@@ -923,7 +910,7 @@ function liveConvert( type, selector ) {
 	return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "&")].join(".");
 }
 
-jQuery.each( ("blur focus load resize scroll unload click dblclick " +
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
 	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
 	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
 
@@ -932,8 +919,8 @@ jQuery.each( ("blur focus load resize scroll unload click dblclick " +
 		return fn ? this.bind( name, fn ) : this.trigger( name );
 	};
 
-	if ( jQuery.fnAttr ) {
-		jQuery.fnAttr[ name ] = true;
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
 	}
 });