X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=00bef8472e5d75c4cbcbf8ed654ea53376b2d038;hb=873c28425fb64fdb48cfa09d17041bded39b301f;hp=fb78bfeedfa9218f2eae431b2571c678f7fc4334;hpb=69994211b078b8711220eaef33cc1bd6a63c5772;p=jquery.git

diff --git a/src/event.js b/src/event.js
index fb78bfe..00bef84 100644
--- a/src/event.js
+++ b/src/event.js
@@ -331,6 +331,7 @@ jQuery.event = {
 			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
 				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
 					event.result = false;
+					event.preventDefault();
 				}
 			}
 
@@ -469,8 +470,8 @@ jQuery.event = {
 		}
 
 		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
-			event.which = event.charCode || event.keyCode;
+		if ( event.which == null && (event.charCode != null || event.charCode != null) ) {
+			event.which = event.charCode != null ? event.charCode : event.keyCode;
 		}
 
 		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)