X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=59fff51da8f25313c42839afb746a1cf0260cc48;hb=2b05e24993c48f3b9c2cb9857090dc4b218b8834;hp=a1a0825dc17bda8801e5d356965dfbc4a2c30e27;hpb=d85a22a70ead4a3a22bf1eebe05d08b498f70aa1;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index a1a0825..59fff51 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
@@ -54,17 +64,15 @@ jQuery.event = {
 			// And bind the global event handler to the element
 			if (element.addEventListener)
 				element.addEventListener(type, element.$handle, false);
-			else if (element.attachEvent)
+			else
 				element.attachEvent("on" + type, element.$handle);
 		}
 
 		// Add the function to the element's handler list
 		handlers[handler.guid] = handler;
 
-		// Remember the function in a global list (for triggering)
-		if (!this.global[type])
-			this.global[type] = [];
-		this.global[type].push( element );
+		// Keep track of which events have been used, for global triggering
+		this.global[type] = true;
 	},
 
 	guid: 1,
@@ -72,7 +80,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
@@ -100,7 +108,7 @@ jQuery.event = {
 				if ( !ret ) {
 					if (element.removeEventListener)
 						element.removeEventListener(type, element.$handle, false);
-					else if (element.detachEvent)
+					else
 						element.detachEvent("on" + type, element.$handle);
 					ret = null;
 					delete events[type];
@@ -119,24 +127,28 @@ jQuery.event = {
 		data = jQuery.makeArray(data || []);
 
 		// Handle a global trigger
-		if ( !element )
-			jQuery.each( this.global[type] || [], function(){
-				jQuery.event.trigger( type, data, this );
-			});
+		if ( !element ) {
+			// Only trigger if we've ever bound an event for it
+			if ( this.global[type] )
+				jQuery("*").trigger(type, data);
 
 		// Handle triggering a single element
-		else {
+		} else {
 			var val, ret, fn = jQuery.isFunction( element[ type ] || null );
 			
 			// Pass along a fake event
 			data.unshift( this.fix({ type: type, target: element }) );
 
 			// Trigger the event
-			if ( (val = this.handle.apply( element, data )) !== false )
-				this.triggered = true;
+			if ( jQuery.isFunction( element.$handle ) )
+				val = element.$handle.apply( element, data );
+			if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+				val = false;
 
-			if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
+			if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+				this.triggered = true;
 				element[ type ]();
+			}
 
 			this.triggered = false;
 		}
@@ -145,11 +157,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 || {} ); 
@@ -189,14 +196,14 @@ jQuery.event = {
 		event.preventDefault = function() {
 			// if preventDefault exists run it on the original event
 			if (originalEvent.preventDefault)
-				return originalEvent.preventDefault();
+				originalEvent.preventDefault();
 			// otherwise set the returnValue property of the original event to false (IE)
 			originalEvent.returnValue = false;
 		};
 		event.stopPropagation = function() {
 			// if stopPropagation exists run it on the original event
 			if (originalEvent.stopPropagation)
-				return originalEvent.stopPropagation();
+				originalEvent.stopPropagation();
 			// otherwise set the cancelBubble property of the original event to true (IE)
 			originalEvent.cancelBubble = true;
 		};
@@ -215,9 +222,9 @@ jQuery.event = {
 
 		// Calculate pageX/Y if missing and clientX/Y available
 		if ( event.pageX == null && event.clientX != null ) {
-			var e = document.documentElement || document.body;
-			event.pageX = event.clientX + e.scrollLeft;
-			event.pageY = event.clientY + e.scrollTop;
+			var e = document.documentElement, b = document.body;
+			event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
+			event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
 		}
 			
 		// Add which for key events
@@ -471,7 +478,7 @@ jQuery.fn.extend({
 			var p = e.relatedTarget;
 	
 			// Traverse up the tree
-			while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; };
+			while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
 			
 			// If we actually just moused on to a sub-element, ignore it
 			if ( p == this ) return false;
@@ -528,10 +535,9 @@ jQuery.fn.extend({
 			f.apply( document, [jQuery] );
 			
 		// Otherwise, remember the function for later
-		else {
+		else
 			// Add the function to the wait list
-			jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
-		}
+			jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
 	
 		return this;
 	}
@@ -566,7 +572,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(); });
 		}
 	}
 });
@@ -943,7 +950,7 @@ new function(){
 		// script does not exist if jQuery is loaded dynamically
 		if ( script ) 
 			script.onreadystatechange = function() {
-				if ( this.readyState != "complete" ) return;
+				if ( document.readyState != "complete" ) return;
 				jQuery.ready();
 			};
 	
@@ -971,16 +978,3 @@ new function(){
 	jQuery.event.add( window, "load", jQuery.ready );
 	
 };
-
-// Clean up after IE to avoid memory leaks
-if (jQuery.browser.msie)
-	jQuery(window).one("unload", function() {
-		var global = jQuery.event.global;
-		for ( var type in global ) {
-			var els = global[type], i = els.length;
-			if ( i && type != 'unload' )
-				do
-					jQuery.event.remove(els[i-1], type);
-				while (--i);
-		}
-	});