From: jeresig <jeresig@gmail.com>
Date: Sat, 27 Feb 2010 14:02:18 +0000 (-0500)
Subject: Merge branch 'master' of github.com:jquery/jquery
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;ds=inline;h=42568db4c414d4435f2f7e89be87d66645c42e1c;hp=-c;p=jquery.git

Merge branch 'master' of github.com:jquery/jquery
---

42568db4c414d4435f2f7e89be87d66645c42e1c
diff --combined src/event.js
index a7900c9,5369b85..42655c9
--- a/src/event.js
+++ b/src/event.js
@@@ -25,10 -25,6 +25,10 @@@ jQuery.event = 
  			elem = window;
  		}
  
 +		if ( handler === false ) {
 +			handler = returnFalse;
 +		}
 +
  		var handleObjIn, handleObj;
  
  		if ( handler.handler ) {
@@@ -142,10 -138,6 +142,10 @@@
  			return;
  		}
  
 +		if ( handler === false ) {
 +			handler = returnFalse;
 +		}
 +
  		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
  			elemData = jQuery.data( elem ),
  			events = elemData && elemData.events;
@@@ -382,7 -374,8 +382,8 @@@
  			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
  		}
  
- 		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
+ 		events = jQuery.data(this, "events");
+ 		handlers = (events || {})[ event.type ];
  
  		if ( events && handlers ) {
  			// Clone the handlers to prevent manipulation
@@@ -838,7 -831,7 +839,7 @@@ jQuery.each(["bind", "one"], function( 
  			return this;
  		}
  		
 -		if ( jQuery.isFunction( data ) ) {
 +		if ( jQuery.isFunction( data ) || data === false ) {
  			fn = data;
  			data = undefined;
  		}
@@@ -1079,15 -1072,8 +1080,15 @@@ jQuery.each( ("blur focus focusin focus
  	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
  
  	// Handle event binding
 -	jQuery.fn[ name ] = function( fn ) {
 -		return fn ? this.bind( name, fn ) : this.trigger( name );
 +	jQuery.fn[ name ] = function( data, fn ) {
 +		if ( fn == undefined ) {
 +			fn = data;
 +			data = null;
 +		}
 +
 +		return arguments.length > 0 ?
 +			this.bind( name, data, fn ) :
 +			this.trigger( name );
  	};
  
  	if ( jQuery.attrFn ) {