aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2006-12-22 13:52:33 +0000
committerJörn Zaefferer <joern.zaefferer@gmail.com>2006-12-22 13:52:33 +0000
commit30dc79f1d0aca3ead3980f890a546bc245feb5d5 (patch)
tree4e3096de8dfbbad6ef19ea8dabc41d2e2ee9cf87 /src
parentccc4c7663a117f4a9c5469f086d18133ae4f2e38 (diff)
downloadjquery-30dc79f1d0aca3ead3980f890a546bc245feb5d5.tar.gz
jquery-30dc79f1d0aca3ead3980f890a546bc245feb5d5.zip
Fixed event fixing (Opera provides event.srcElement, only create pageX if clientX is available)
Diffstat (limited to 'src')
-rw-r--r--src/jquery/jquery.js14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 8a0a115c4..330e05adc 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1982,38 +1982,34 @@ jQuery.extend({
},
fix: function(event) {
- // fix target property, if available
- if(event.srcElement)
+ // fix target property, if necessary
+ if(!event.target && event.srcElement)
event.target = event.srcElement;
- // calculate pageX/Y if missing
- if(typeof event.pageX == "undefined") {
+ // calculate pageX/Y if missing and clientX/Y available
+ if(typeof event.pageX == "undefined" && typeof event.clientX != "undefined") {
var e = document.documentElement, b = document.body;
event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft);
event.pageY = event.clientY + (e.scrollTop || b.scrollTop);
}
-
- // check if target is a textnode (only for safari)
+ // check safari and if target is a textnode
if(jQuery.browser.safari && event.target.nodeType == 3) {
// target is readonly, clone the event object
event = jQuery.extend({}, event);
// get parentnode from textnode
event.target = event.target.parentNode;
}
-
// fix preventDefault and stopPropagation
if (!event.preventDefault) {
event.preventDefault = function() {
this.returnValue = false;
};
}
-
if (!event.stopPropagation) {
event.stopPropagation = function() {
this.cancelBubble = true;
};
}
-
return event;
}
}