X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=0f976a060d52d61755dee5fdbf6dca6492188d77;hb=45dfa3b0fc49718c4f00600d1e25a129601d08ee;hp=380d3d49e38d9d069b6cc2d7a8daae19bddacb64;hpb=bca82254137a161094377b2d8189c2d9d5906a0f;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 380d3d4..0f976a0 100644
--- a/src/event.js
+++ b/src/event.js
@@ -405,7 +405,7 @@ jQuery.event = {
 			add: function( proxy, data, namespaces ) {
 				jQuery.extend( proxy, data || {} );
 				proxy.guid += data.selector + data.live;
-				jQuery.event.add( this, data.live, liveHandler );
+				jQuery.event.add( this, data.live, liveHandler, data );
 			},
 
 			remove: function( namespaces ) {
@@ -467,6 +467,7 @@ jQuery.Event.prototype = {
 		if ( !e ) {
 			return;
 		}
+		
 		// if preventDefault exists run it on the original event
 		if ( e.preventDefault ) {
 			e.preventDefault();
@@ -533,6 +534,41 @@ jQuery.each({
 	};
 });
 
+(function() {
+	
+	var event = jQuery.event,
+		special = event.special,
+		handle  = event.handle;
+
+	special.submit = {
+		setup: function(data, namespaces) {
+			if(data.selector) {
+				event.add(this, 'click.specialSubmit', function(e, eventData) {
+					if(jQuery(e.target).filter(":submit, :image").closest(data.selector).length) {
+						e.type = "submit";
+						return handle.call( this, e, eventData );
+					}
+				});
+				
+				event.add(this, 'keypress.specialSubmit', function( e, eventData ) {
+					if(jQuery(e.target).filter(":text, :password").closest(data.selector).length) {
+						e.type = "submit";
+						return handle.call( this, e, eventData );
+					}
+				});
+			} else {
+				return false;
+			}
+		},
+		
+		remove: function(namespaces) {
+			event.remove(this, 'click.specialSubmit');
+			event.remove(this, 'keypress.specialSubmit');
+		}
+	};
+	
+})();
+
 // Create "bubbling" focus and blur events
 jQuery.each({
 	focus: "focusin",
@@ -564,11 +600,18 @@ jQuery.each({
 });
 
 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;
 		}
@@ -579,10 +622,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;
 		}
@@ -597,6 +646,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 );
 		});