X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=76b1dfb20102c9a0ec2780d3bc2249bcb7b963d9;hb=9ebb2fc654d51244618e208705e2258fe733058f;hp=9d77314b59af37671b7efa59f84351e3c108d1dc;hpb=f3474c00cd6d9e5fd61b6ef1562003e9986ad67d;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 9d77314..76b1dfb 100644
--- a/src/event.js
+++ b/src/event.js
@@ -518,9 +518,10 @@ var withinElement = function( event ) {
 	}
 };
 
+// Create mouseenter and mouseleave events
 jQuery.each({
-	mouseover: 'mouseenter',
-	mouseout: 'mouseleave'
+	mouseover: "mouseenter",
+	mouseout: "mouseleave"
 }, function( orig, fix ) {
 	jQuery.event.special[ fix ] = {
 		setup: function(){
@@ -532,12 +533,49 @@ jQuery.each({
 	};
 });
 
+// Create "bubbling" focus and blur events
+jQuery.each({
+	focus: "focusin",
+	blur: "focusout"
+}, function( orig, fix ){
+	var event = jQuery.event,
+		special = event.special,
+		handle = event.handle;
+	
+	function ieHandler() { 
+		arguments[0].type = orig;
+		return handle.apply(this, arguments);
+	}
+
+	special[orig] = {
+		setup:function() {
+			if ( this.addEventListener )
+				this.addEventListener( orig, handle, true );
+			else
+				jQuery.event.add( this, fix, ieHandler );
+		}, 
+		teardown:function() { 
+			if ( this.removeEventListener )
+				this.removeEventListener( orig, handle, true );
+			else
+				jQuery.event.remove( this, fix, ieHandler );
+		}
+	};
+});
+
 jQuery.fn.extend({
+	// TODO: make bind(), unbind() and one() DRY!
 	bind: function( type, data, fn, thisObject ) {
-		if ( jQuery.isFunction( data ) ) {
-			if ( fn !== undefined ) {
-				thisObject = fn;
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this.bind(key, data, type[key], fn);
 			}
+			return this;
+		}
+		
+		if ( jQuery.isFunction( data ) ) {
+			thisObject = fn;
 			fn = data;
 			data = undefined;
 		}
@@ -548,10 +586,16 @@ jQuery.fn.extend({
 	},
 
 	one: function( type, data, fn, thisObject ) {
-		if ( jQuery.isFunction( data ) ) {
-			if ( fn !== undefined ) {
-				thisObject = fn;
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this.one(key, data, type[key], fn);
 			}
+			return this;
+		}
+		
+		if ( jQuery.isFunction( data ) ) {
+			thisObject = fn;
 			fn = data;
 			data = undefined;
 		}
@@ -566,6 +610,14 @@ jQuery.fn.extend({
 	},
 
 	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+			return this;
+		}
+		
 		return this.each(function() {
 			jQuery.event.remove( this, type, fn );
 		});