Tweak the logic for fixing event.which. Fixes #2338.

diff --git a/src/event.js b/src/event.js
index 65b59523e9179355568f8d6525f52d1f374d703f..00bef8472e5d75c4cbcbf8ed654ea53376b2d038 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -470,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)