X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=a3db2f3ab0bcb501fe85903d0175c4e253913390;hb=2897b1bd2383031b6764192dc1ccb1d1205139a3;hp=e276ab6dac0ec925ea5c85e15fc4777a3d0eaf2b;hpb=6b729ff7984d9d4d09dff042a3896022dae3783d;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index e276ab6..a3db2f3 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -12,38 +12,58 @@ jQuery.event = {
 		// around, causing it to be cloned in the process
 		if ( jQuery.browser.msie && element.setInterval != undefined )
 			element = window;
+		
+		// if data is passed, bind to handler 
+		if( data != undefined ) { 
+        	// Create temporary function pointer to original handler 
+			var fn = handler; 
+
+			// Create unique handler function, wrapped around original handler 
+			handler = function() { 
+				// Pass arguments and context to original handler 
+				return fn.apply(this, arguments); 
+			};
 
-		// if data is passed, bind to handler
-		if( data ) 
+			// Store data in unique handler 
 			handler.data = data;
 
+			// Set the guid of unique handler to the same of original handler, so it can be removed 
+			handler.guid = fn.guid;
+		}
+
 		// 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)
 			element.$events = {};
+		
+		if (!element.$handle)
+			element.$handle = function() {
+				jQuery.event.handle.apply(element, arguments);
+			};
 
 		// Get the current list of functions bound to this event
 		var handlers = element.$events[type];
 
-		// If it hasn't been initialized yet
+		// Init the event handler queue
 		if (!handlers) {
-			// Init the event handler queue
-			handlers = element.$events[type] = {};
-
-			// Remember an existing handler, if it's already there
-			if (element["on" + type])
-				handlers[0] = element["on" + type];
+			handlers = element.$events[type] = {};	
+			
+			// And bind the global event handler to the element
+			if (element.addEventListener)
+				element.addEventListener(type, element.$handle, false);
+			else if (element.attachEvent)
+				element.attachEvent("on" + type, element.$handle);
 		}
 
 		// Add the function to the element's handler list
 		handlers[handler.guid] = handler;
 
-		// And bind the global event handler to the element
-		element["on" + type] = this.handle;
-
 		// Remember the function in a global list (for triggering)
 		if (!this.global[type])
 			this.global[type] = [];
@@ -75,13 +95,17 @@ jQuery.event = {
 				
 				// remove all handlers for the given type
 				else
-					for ( handler in events[type] )
+					for ( handler in element.$events[type] )
 						delete events[type][handler];
 
 				// remove generic event handler if no more handlers exist
 				for ( ret in events[type] ) break;
 				if ( !ret ) {
-					ret = element["on" + type] = undefined;
+					if (element.removeEventListener)
+						element.removeEventListener(type, element.$handle, false);
+					else if (element.detachEvent)
+						element.detachEvent("on" + type, element.$handle);
+					ret = null;
 					delete events[type];
 				}
 			}
@@ -89,7 +113,7 @@ jQuery.event = {
 			// Remove the expando if it's no longer used
 			for ( ret in events ) break;
 			if ( !ret )
-				delete element.$events;
+				element.$handle = element.$events = null;
 		}
 	},
 
@@ -105,19 +129,16 @@ jQuery.event = {
 
 		// Handle triggering a single element
 		else {
-			var handler = element["on" + type ], val,
-				fn = jQuery.isFunction( element[ type ] );
+			var val, ret, fn = jQuery.isFunction( element[ type ] );
+			
+			// Pass along a fake event
+			data.unshift( this.fix({ type: type, target: element }) );
 
-			if ( handler ) {
-				// Pass along a fake event
-				data.unshift( this.fix({ type: type, target: element }) );
-	
-				// Trigger the event
-				if ( (val = handler.apply( element, data )) !== false )
-					this.triggered = true;
-			}
+			// Trigger the event
+			if ( (val = this.handle.apply( element, data )) !== false )
+				this.triggered = true;
 
-			if ( fn && val !== false )
+			if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
 				element[ type ]();
 
 			this.triggered = false;
@@ -256,7 +277,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 );
 		});
 	},
 	
@@ -291,7 +312,7 @@ jQuery.fn.extend({
 			jQuery.event.add( this, type, function(event) {
 				jQuery(this).unbind(event);
 				return (fn || data).apply( this, arguments);
-			}, data);
+			}, fn && data);
 		});
 	},