X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=959e89c5e96f18bbf67ecd809e90caadcfa7f880;hb=974b5aeab7a3788ff5fb9db87b9567784e0249fc;hp=d949d0f0f8f5c5bae27ad6cb65fbcddd30c04d52;hpb=1df5084c9748a8d38516266063344f145bc428c0;p=jquery.git

diff --git a/src/event.js b/src/event.js
index d949d0f..959e89c 100644
--- a/src/event.js
+++ b/src/event.js
@@ -7,7 +7,8 @@ var rnamespaces = /\.(.*)$/,
 	rescape = /[^\w\s.|`]/g,
 	fcleanup = function( nm ) {
 		return nm.replace(rescape, "\\$&");
-	};
+	},
+	focusCounts = { focusin: 0, focusout: 0 };
 
 /*
  * A number of helper functions used for managing events.
@@ -31,6 +32,9 @@ jQuery.event = {
 
 		if ( handler === false ) {
 			handler = returnFalse;
+		} else if ( !handler ) {
+		  // Fixes bug #7229. Fix recommended by jdalton
+		  return;
 		}
 
 		var handleObjIn, handleObj;
@@ -54,7 +58,10 @@ jQuery.event = {
 			return;
 		}
 
-		var events = elemData.events,
+		// Use a key less likely to result in collisions for plain JS objects.
+		// Fixes bug #7150.
+		var eventKey = elem.nodeType ? "events" : "__events__",
+			events = elemData[ eventKey ],
 			eventHandle = elemData.handle;
 			
 		if ( typeof events === "function" ) {
@@ -68,7 +75,7 @@ jQuery.event = {
 			if ( !elem.nodeType ) {
 				// On plain objects, create a fn that acts as the holder
 				// of the values to avoid JSON serialization of event data
-				elemData.events = elemData = function(){};
+				elemData[ eventKey ] = elemData = function(){};
 			}
 
 			elemData.events = events = {};
@@ -170,8 +177,9 @@ jQuery.event = {
 		}
 
 		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			eventKey = elem.nodeType ? "events" : "__events__",
 			elemData = jQuery.data( elem ),
-			events = elemData && elemData.events;
+			events = elemData && elemData[ eventKey ];
 
 		if ( !elemData || !events ) {
 			return;
@@ -282,7 +290,7 @@ jQuery.event = {
 			delete elemData.handle;
 
 			if ( typeof elemData === "function" ) {
-				jQuery.removeData( elem, "events" );
+				jQuery.removeData( elem, eventKey );
 
 			} else if ( jQuery.isEmptyObject( elemData ) ) {
 				jQuery.removeData( elem );
@@ -346,7 +354,7 @@ jQuery.event = {
 		// Trigger the event, it is assumed that "handle" is a function
 		var handle = elem.nodeType ?
 			jQuery.data( elem, "handle" ) :
-			(jQuery.data( elem, "events" ) || {}).handle;
+			(jQuery.data( elem, "__events__" ) || {}).handle;
 
 		if ( handle ) {
 			handle.apply( elem, data );
@@ -420,7 +428,7 @@ jQuery.event = {
 
 		event.namespace = event.namespace || namespace_sort.join(".");
 
-		events = jQuery.data(this, "events");
+		events = jQuery.data(this, this.nodeType ? "events" : "__events__");
 
 		if ( typeof events === "function" ) {
 			events = events.events;
@@ -787,6 +795,8 @@ if ( !jQuery.support.changeBubbles ) {
 		filters: {
 			focusout: testChange, 
 
+			beforedeactivate: testChange,
+
 			click: function( e ) {
 				var elem = e.target, type = elem.type;
 
@@ -851,17 +861,21 @@ if ( document.addEventListener ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				this.addEventListener( orig, handler, true );
+				if ( focusCounts[fix]++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
 			}, 
 			teardown: function() { 
-				this.removeEventListener( orig, handler, true );
+				if ( --focusCounts[fix] === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
 			}
 		};
 
 		function handler( e ) { 
 			e = jQuery.event.fix( e );
 			e.type = fix;
-			return jQuery.event.handle.call( this, e );
+			return jQuery.event.trigger( e, null, e.target );
 		}
 	});
 }
@@ -1044,7 +1058,7 @@ jQuery.each(["live", "die"], function( i, name ) {
 function liveHandler( event ) {
 	var stop, maxLevel, elems = [], selectors = [],
 		related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
-		events = jQuery.data( this, "events" );
+		events = jQuery.data( this, this.nodeType ? "events" : "__events__" );
 
 	if ( typeof events === "function" ) {
 		events = events.events;
@@ -1118,6 +1132,9 @@ function liveHandler( event ) {
 			if ( ret === false ) {
 				stop = false;
 			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
 		}
 	}