X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=9adf477d05d24a9cf85220ab75796be257970ffb;hb=5c54a4b8ee5cfea3aff55a1122b187b731319e61;hp=3834fd65f53e21c41971dff4a6621510c12f5cb7;hpb=1d2faf36cf356bc09d3389ad6fce6ee520560f25;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 3834fd6..9adf477 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -32,8 +32,11 @@ jQuery.event = {
 		}
 
 		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid )
+		if ( !handler.guid ) {
 			handler.guid = this.guid++;
+			// Don't forget to set guid for the original handler function
+			if (fn) fn.guid = handler.guid;
+		}
 
 		// Init the element's event structure
 		if (!element.$events)
@@ -55,7 +58,7 @@ jQuery.event = {
 			if (element.addEventListener)
 				element.addEventListener(type, element.$handle, false);
 			else if (element.attachEvent)
-				element.attachEvent("on" + type, element.$handle, false);
+				element.attachEvent("on" + type, element.$handle);
 		}
 
 		// Add the function to the element's handler list
@@ -101,7 +104,7 @@ jQuery.event = {
 					if (element.removeEventListener)
 						element.removeEventListener(type, element.$handle, false);
 					else if (element.detachEvent)
-						element.detachEvent("on" + type, element.$handle, false);
+						element.detachEvent("on" + type, element.$handle);
 					ret = null;
 					delete events[type];
 				}
@@ -126,7 +129,7 @@ jQuery.event = {
 
 		// Handle triggering a single element
 		else {
-			var val, ret, fn = jQuery.isFunction( element[ type ] );
+			var val, ret, fn = jQuery.isFunction( element[ type ] || null );
 			
 			// Pass along a fake event
 			data.unshift( this.fix({ type: type, target: element }) );
@@ -143,19 +146,18 @@ 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;
+		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 || {} ); 
 
-		// returned undefined or false
-		var returnValue;
-
-		var c = this.$events[event.type];
-
-		var args = [].slice.call( arguments, 1 );
+		var c = this.$events[event.type], args = [].slice.call( arguments, 1 );
 		args.unshift( event );
 
 		for ( var j in c ) {
@@ -167,14 +169,16 @@ jQuery.event = {
 			if ( c[j].apply( this, args ) === false ) {
 				event.preventDefault();
 				event.stopPropagation();
-				returnValue = false;
+				val = false;
 			}
 		}
 
 		// Clean up added properties in IE to prevent memory leak
-		if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = event.handler = event.data = null;
+		if (jQuery.browser.msie)
+			event.target = event.preventDefault = event.stopPropagation =
+				event.handler = event.data = null;
 
-		return returnValue;
+		return val;
 	},
 
 	fix: function(event) {
@@ -274,7 +278,7 @@ jQuery.fn.extend({
 	 */
 	bind: function( type, data, fn ) {
 		return this.each(function(){
-			jQuery.event.add( this, type, fn || data, data );
+			jQuery.event.add( this, type, fn || data, fn && data );
 		});
 	},
 	
@@ -309,7 +313,7 @@ jQuery.fn.extend({
 			jQuery.event.add( this, type, function(event) {
 				jQuery(this).unbind(event);
 				return (fn || data).apply( this, arguments);
-			}, data);
+			}, fn && data);
 		});
 	},
 
@@ -412,7 +416,7 @@ jQuery.fn.extend({
 
 		return this.click(function(e) {
 			// Figure out which function to execute
-			this.lastToggle = this.lastToggle == 0 ? 1 : 0;
+			this.lastToggle = 0 == this.lastToggle ? 1 : 0;
 			
 			// Make sure that clicks stop
 			e.preventDefault();
@@ -548,6 +552,9 @@ jQuery.extend({
 			// Remove event lisenter to avoid memory leak
 			if ( jQuery.browser.mozilla || jQuery.browser.opera )
 				document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
+			
+			// Remove script element used by IE hack
+			jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
 		}
 	}
 });
@@ -925,7 +932,6 @@ new function(){
 		if ( script ) 
 			script.onreadystatechange = function() {
 				if ( this.readyState != "complete" ) return;
-				this.parentNode.removeChild( this );
 				jQuery.ready();
 			};