X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=9c1f287343c52af16f19069faaa2f87c995a39e9;hb=ee34b6982ab25cd7699f68506d7b18a02c3c4d44;hp=cac56bd6f75bc432d1f2a5441c5ecff05892269f;hpb=739644dce5312fc66a37806ff5e07c8e9784f803;p=jquery.git

diff --git a/src/event.js b/src/event.js
index cac56bd..9c1f287 100644
--- a/src/event.js
+++ b/src/event.js
@@ -247,16 +247,22 @@ jQuery.event = {
 			handle.apply( elem, data );
 		}
 
+		var nativeFn, nativeHandler;
+		try {
+			nativeFn = elem[ type ];
+			nativeHandler = elem[ "on" + type ];
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (e) {}
 		// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
-		if ( (!elem[ type ] || (jQuery.nodeName(elem, 'a') && type === "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) {
+		if ( (!nativeFn || (jQuery.nodeName(elem, 'a') && type === "click")) && nativeHandler && nativeHandler.apply( elem, data ) === false ) {
 			event.result = false;
 		}
 
 		// Trigger the native events (except for clicks on links)
-		if ( !bubbling && elem[ type ] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type === "click") ) {
+		if ( !bubbling && nativeFn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type === "click") ) {
 			this.triggered = true;
 			try {
-				elem[ type ]();
+				nativeFn();
 			// prevent IE from throwing an error for some hidden elements
 			} catch (e) {}
 		}
@@ -368,7 +374,7 @@ jQuery.event = {
 
 		// Add which for click: 1 == left; 2 == middle; 3 == right
 		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button ) {
+		if ( !event.which && event.button !== undefined ) {
 			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
 		}