From da5706c974f8ef720b3194179366e1096c19269e Mon Sep 17 00:00:00 2001
From: Robert Katic <robert.katic@gmail.com>
Date: Sun, 14 Mar 2010 12:34:32 +0100
Subject: [PATCH] Added support for map of events in live, die, delegate and
 undelegate. Fixes #6282.

---
 src/event.js       |    8 ++++++++
 test/unit/event.js |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/event.js b/src/event.js
index 264ac5b..e667ddb 100644
--- a/src/event.js
+++ b/src/event.js
@@ -944,6 +944,14 @@ jQuery.each(["live", "die"], function( i, name ) {
 		var type, i = 0, match, namespaces, preType,
 			selector = origSelector || this.selector,
 			context = origSelector ? this : jQuery( this.context );
+		
+		if ( typeof types === "object" && !types.preventDefault ) {
+			for ( var key in types ) {
+				context[ name ]( key, data, types[key], selector );
+			}
+			
+			return this;
+		}
 
 		if ( jQuery.isFunction( data ) ) {
 			fn = data;
diff --git a/test/unit/event.js b/test/unit/event.js
index 9e1ac89..a133a10 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -206,6 +206,45 @@ test("bind/one/unbind(Object)", function(){
 	equals( mouseoverCounter, 4, "bind(Object)" );
 });
 
+test("live/die(Object), delegate/undelegate(String, Object)", function() {
+	expect(6);
+	
+	var clickCounter = 0, mouseoverCounter = 0,
+		$p = jQuery("#firstp"), $a = $p.find("a");
+	
+	var events = {
+		click: function( event ) {
+			clickCounter += ( event.data || 1 );
+		},
+		mouseover: function( event ) {
+			mouseoverCounter += ( event.data || 1 );
+		}
+	};
+	
+	function trigger() {
+		$a.trigger("click").trigger("mouseover");
+	}
+	
+	$a.live( events );
+	$p.delegate( "a", events, 2 );
+	
+	trigger();
+	equals( clickCounter, 3, "live/delegate(Object)" );
+	equals( mouseoverCounter, 3, "live/delegate(Object)" );
+	
+	$p.undelegate( "a", events );
+	
+	trigger();
+	equals( clickCounter, 4, "undelegate(Object)" );
+	equals( mouseoverCounter, 4, "undelegate(Object)" );
+	
+	$a.die( events );
+	
+	trigger();
+	equals( clickCounter, 4, "die(Object)" );
+	equals( mouseoverCounter, 4, "die(Object)" );
+});
+
 test("bind(), iframes", function() {
 	// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
 	var doc = jQuery("#loadediframe").contents();
-- 
1.7.10.4