X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=e90ef0760a61da01f7593c7777387008fbfee62b;hb=0eaead0b919bf173b917cf874f953570ccd1a536;hp=c7e2f4f43560d5467d25e81579497139b25a3c9a;hpb=b2552e6ea35a1e00675d70a615d3af83137965df;p=jquery.git

diff --git a/src/event.js b/src/event.js
index c7e2f4f..e90ef07 100644
--- a/src/event.js
+++ b/src/event.js
@@ -213,21 +213,17 @@ jQuery.event = {
 
 		event.currentTarget = elem;
 
-		var fn = jQuery.isFunction( elem[ type ] );
-
 		// Trigger the event, it is assumed that "handle" is a function
 		var handle = jQuery.data(elem, "handle");
 		if ( handle )
 			handle.apply( elem, data );
 
 		// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
-		if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+		if ( (!elem[type] || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
 			event.result = false;
 
-		// data.shift();
-
 		// Trigger the native events (except for clicks on links)
-		if ( !bubbling && fn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
+		if ( !bubbling && elem[type] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
 			this.triggered = true;
 			try {
 				elem[ type ]();