X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=1b24a31e7447ecef7bc32c2bf5b5f73d5ba7a70f;hb=24db022ba06523f92e94ac5fa791fc4865b55ba7;hp=f264a2cd2223598a7e396f2e941a8ea12f6cad7a;hpb=f267cfaedf9f01ddf1f6f9c214ea07906c01a84a;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index f264a2c..1b24a31 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -148,11 +148,15 @@ jQuery.event = {
 			data.unshift( this.fix({ type: type, target: element }) );
 
 			// Trigger the event
-			if ( jQuery.isFunction(element.$handle) && (val = element.$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;
 		}
@@ -482,7 +486,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;
@@ -541,7 +545,7 @@ jQuery.fn.extend({
 		// Otherwise, remember the function for later
 		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;
 	}