X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=b13e5a02f36d2b01ba1e72f41b64d788d6a5a562;hb=d8e9f0c616402ed1b4dab244ff5f8680ed0a415f;hp=f264a2cd2223598a7e396f2e941a8ea12f6cad7a;hpb=f267cfaedf9f01ddf1f6f9c214ea07906c01a84a;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index f264a2c..b13e5a0 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') ) {
+				this.triggered = true;
 				element[ type ]();
+			}
 
 			this.triggered = false;
 		}