Changeset 1929

Timestamp:

05/20/07 16:51:52 (2 years ago)

Author:

jeresig

Message:

Added support for the event object properties relatedTarget, metaKey, which, and charCode. Fixes bug #1204.

Files:

• trunk/jquery/src/event/event.js (modified) (2 diffs)

trunk/jquery/src/event/event.js

@@ -187 +187 @@
             event.target = event.srcElement;
 
+        // Add relatedTarget, if necessary
+        if ( !event.relatedTarget && event.fromElement )
+            event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
+
+        // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+        if ( event.metaKey == null && event.ctrlKey != null )
+            event.metaKey = event.ctrlKey;
+
+        // Add which for click: 1 == left; 2 == middle; 3 == right
+        // Note: button is not normalized, so don't use it
+        if ( event.which == null && event.button != null )
+            event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+
         // Calculate pageX/Y if missing and clientX/Y available
-        if ( event.pageX == undefined && event.clientX != undefined ) {
+        if ( event.pageX == null && event.clientX != null ) {
             var e = document.documentElement || document.body;
             event.pageX = event.clientX + e.scrollLeft;
             event.pageY = event.clientY + e.scrollTop;
         }
+
+        // Add which for keypresses: keyCode
+        if ( (event.which == null || event.type == "keypress") && event.keyCode != null )
+            event.which = event.keyCode;    
+
+        // If it's a keypress event, add charCode to IE
+        if ( event.charCode == null && event.type == "keypress" )
+            event.charCode = event.keyCode;
                 
         // check if target is a textnode (safari)
@@ -457 +478 @@
         function handleHover(e) {
             // Check if mouse(over|out) are still within the same parent element
-            var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
+            var p = e.relatedTarget;
     
             // Traverse up the tree