X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=bea2cbac7c6a093b9705b60464e50f894870f07e;hb=456094c2053bb4a6ee37f50dc1d0093b3cd12fd6;hp=a1a0825dc17bda8801e5d356965dfbc4a2c30e27;hpb=d85a22a70ead4a3a22bf1eebe05d08b498f70aa1;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index a1a0825..bea2cba 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -41,7 +41,17 @@ jQuery.event = {
 		
 		if (!element.$handle)
 			element.$handle = function() {
-				jQuery.event.handle.apply(element, arguments);
+				// returned undefined or false
+				var val;
+
+				// Handle the second event of a trigger and when
+				// an event is called after a page has unloaded
+				if ( typeof jQuery == "undefined" || jQuery.event.triggered )
+				  return val;
+				
+				val = jQuery.event.handle.apply(element, arguments);
+				
+				return val;
 			};
 
 		// Get the current list of functions bound to this event
@@ -64,7 +74,9 @@ jQuery.event = {
 		// Remember the function in a global list (for triggering)
 		if (!this.global[type])
 			this.global[type] = [];
-		this.global[type].push( element );
+		// Only add the element to the global list once
+		if (jQuery.inArray(element, this.global[type]) == -1)
+			this.global[type].push( element );
 	},
 
 	guid: 1,
@@ -72,7 +84,7 @@ jQuery.event = {
 
 	// Detach an event or set of events from an element
 	remove: function(element, type, handler) {
-		var events = element.$events, ret;
+		var events = element.$events, ret, index;
 
 		if ( events ) {
 			// type is actually an event object here
@@ -104,6 +116,10 @@ jQuery.event = {
 						element.detachEvent("on" + type, element.$handle);
 					ret = null;
 					delete events[type];
+					
+					// Remove element from the global event type cache
+					while ( this.global[type] && ( (index = jQuery.inArray(element, this.global[type])) >= 0 ) )
+						delete this.global[type][index];
 				}
 			}
 
@@ -132,7 +148,7 @@ jQuery.event = {
 			data.unshift( this.fix({ type: type, target: element }) );
 
 			// Trigger the event
-			if ( (val = this.handle.apply( element, data )) !== false )
+			if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false )
 				this.triggered = true;
 
 			if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
@@ -145,11 +161,6 @@ jQuery.event = {
 	handle: function(event) {
 		// returned undefined or false
 		var val;
-		
-		// Handle the second event of a trigger and when
-		// an event is called after a page has unloaded
-		if ( typeof jQuery == "undefined" || jQuery.event.triggered )
-		  return val;
 
 		// Empty object is for triggered events with no data
 		event = jQuery.event.fix( event || window.event || {} ); 
@@ -566,7 +577,8 @@ jQuery.extend({
 				document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
 			
 			// Remove script element used by IE hack
-			jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+			if( !window.frames.length ) // don't remove if frames are present (#1187)
+				jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
 		}
 	}
 });
@@ -980,7 +992,7 @@ if (jQuery.browser.msie)
 			var els = global[type], i = els.length;
 			if ( i && type != 'unload' )
 				do
-					jQuery.event.remove(els[i-1], type);
+					els[i-1] && jQuery.event.remove(els[i-1], type);
 				while (--i);
 		}
 	});