X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=f36139fb5f87798b52e5c9ae5918b5db34b78277;hb=eb496f757a1eebef14eb5a1fdd971cc553f3540b;hp=3e3f834421dc82bd4b737c559a2fe5e5abbca91f;hpb=a5dbca4a06a930865a17a1d02fd88893b5a2b690;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 3e3f834..f36139f 100644
--- a/src/event.js
+++ b/src/event.js
@@ -57,6 +57,12 @@ jQuery.event = {
 			handle = jQuery.data( elem, "handle", eventHandle );
 		}
 
+		// If no handle is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !handle ) {
+			return;
+		}
+
 		// Add elem as a property of the handle function
 		// This is to prevent a memory leak with non-native
 		// event in IE.
@@ -404,13 +410,17 @@ jQuery.event = {
 		return event;
 	},
 
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
 	proxy: jQuery.proxy,
 
 	special: {
 		ready: {
 			// Make sure the ready event is setup
 			setup: jQuery.bindReady,
-			teardown: function() {}
+			teardown: jQuery.noop
 		},
 
 		live: {
@@ -600,6 +610,9 @@ jQuery.event.special.submit = {
 					return trigger( "submit", this, arguments );
 				}
 			});
+
+		} else {
+			return false;
 		}
 	},
 
@@ -752,7 +765,6 @@ jQuery.each(["bind", "one"], function( i, name ) {
 		}
 		
 		if ( jQuery.isFunction( data ) ) {
-			thisObject = fn;
 			fn = data;
 			data = undefined;
 		}
@@ -762,9 +774,11 @@ jQuery.each(["bind", "one"], function( i, name ) {
 			return fn.apply( this, arguments );
 		}) : fn;
 
-		return type === "unload" ? this.one(type, data, handler) : this.each(function() {
-			jQuery.event.add( this, type, handler, data );
-		});
+		return type === "unload" && name !== "one" ?
+			this.one( type, data, fn ) :
+			this.each(function() {
+				jQuery.event.add( this, type, handler, data );
+			});
 	};
 });
 
@@ -901,7 +915,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 ) {
 
@@ -910,8 +924,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;
 	}
 });