Improved event fixing, using less browser and more object detection

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 025dd77..fd6d3a2 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1960,9 +1960,6 @@ jQuery.extend({
 \r
                        event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data\r
 \r
-                       // If no correct event was found, fail\r
-                       if ( !event ) return false;\r
-\r
                        var returnValue = true;\r
 \r
                        var c = this.events[event.type];\r
@@ -1985,20 +1982,19 @@ jQuery.extend({
                },\r
 \r
                fix: function(event) {\r
-                       // check IE\r
-                       if(jQuery.browser.msie) {\r
-                               // fix target property, if available\r
-                               // check prevents overwriting of fake target coming from trigger\r
-                               if(event.srcElement)\r
-                                       event.target = event.srcElement;\r
-                                       \r
-                               // calculate pageX/Y\r
+                       // fix target property, if available\r
+                       if(event.srcElement)\r
+                               event.target = event.srcElement;\r
+               \r
+                       // calculate pageX/Y if missing\r
+                       if(typeof event.pageX == "undefined") {\r
                                var e = document.documentElement, b = document.body;\r
                                event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft);\r
                                event.pageY = event.clientY + (e.scrollTop || b.scrollTop);\r
+                       }\r
                                        \r
-                       // check safari and if target is a textnode\r
-                       } else if(jQuery.browser.safari && event.target.nodeType == 3) {\r
+                       // check if target is a textnode (only for safari)\r
+                       if(jQuery.browser.safari && event.target.nodeType == 3) {\r
                                // target is readonly, clone the event object\r
                                event = jQuery.extend({}, event);\r
                                // get parentnode from textnode\r
@@ -2006,15 +2002,17 @@ jQuery.extend({
                        }\r
                        \r
                        // fix preventDefault and stopPropagation\r
-                       if (!event.preventDefault)\r
+                       if (!event.preventDefault) {\r
                                event.preventDefault = function() {\r
                                        this.returnValue = false;\r
                                };\r
+                       }\r
                                \r
-                       if (!event.stopPropagation)\r
+                       if (!event.stopPropagation) {\r
                                event.stopPropagation = function() {\r
                                        this.cancelBubble = true;\r
                                };\r
+                       }\r
                                \r
                        return event;\r
                }\r