X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevent%2Fevent.js;h=63a8a7cbc9e18c1158d3f20bb984d862bb229436;hb=729396e6cfb1a0495399609f5929fb630a49649d;hp=b9f130b6c9f2ea3ce1413b379a046868ec111f46;hpb=39b0976e3ed605ec985a6171b059f20ad566808d;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index b9f130b..63a8a7c 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -82,15 +82,14 @@ jQuery.event = {
 
 		// Handle triggering a single element
 		} else if ( element["on" + type] ) {
-			if ( element[ type ] && element[ type ].constructor == Function )
-				element[ type ]();
-			else {
-				// Pass along a fake event
-				data.unshift( this.fix({ type: type, target: element }) );
+			// Pass along a fake event
+			data.unshift( this.fix({ type: type, target: element }) );
 	
-				// Trigger the event
-				element["on" + type].apply( element, data );
-			}
+			// Trigger the event
+			var val = element["on" + type].apply( element, data );
+
+			if ( val !== false && jQuery.isFunction( element[ type ] ) )
+				element[ type ]();
 		}
 	},