Fixed event fixing (Opera provides event.srcElement, only create pageX if clientX...

diff --git a/newandnoteworthy.txt b/newandnoteworthy.txt
index 713ef09..d0d6fc5 100644 (file)
--- a/newandnoteworthy.txt
+++ b/newandnoteworthy.txt
@@ -7,7 +7,7 @@ New and Noteworthy
  - Fixed synchronous requests
  - $.get, $.getIfModified, $.post, $.getScript and $.getJSON now all pass through the XMLHttpRequest as returned by $.ajax
  - Improved AJAX docs (eg. more examples for $.ajax
- - Improved event fixing, using less browser and more object detection
+ - Improved event fixingFixed event fixing (Opera provides event.srcElement, must ignore it if target is available; only create pageX if clientX is available)
  - Fixed ID with context selectors (eg. div#id doesn't ignore "div" anymore)
  - Improved jQuery.merge to avoid unnecessary loops
  - Fixed docs for html(): Now mentions that is not available for XML documents

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 8a0a115..330e05a 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1982,38 +1982,34 @@ jQuery.extend({
                },\r
 \r
                fix: function(event) {\r
-                       // fix target property, if available\r
-                       if(event.srcElement)\r
+                       // fix target property, if necessary\r
+                       if(!event.target && event.srcElement)\r
                                event.target = event.srcElement;\r
                \r
-                       // calculate pageX/Y if missing\r
-                       if(typeof event.pageX == "undefined") {\r
+                       // calculate pageX/Y if missing and clientX/Y available\r
+                       if(typeof event.pageX == "undefined" && typeof event.clientX != "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 if target is a textnode (only for safari)\r
+                       // check safari and if target is a textnode\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
                                event.target = event.target.parentNode;\r
                        }\r
-                       \r
                        // fix preventDefault and stopPropagation\r
                        if (!event.preventDefault) {\r
                                event.preventDefault = function() {\r
                                        this.returnValue = false;\r
                                };\r
                        }\r
-                               \r
                        if (!event.stopPropagation) {\r
                                event.stopPropagation = function() {\r
                                        this.cancelBubble = true;\r
                                };\r
                        }\r
-                               \r
                        return event;\r
                }\r
        }\r