X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=330e05adceddeddb646740b5e286fd2086cc1381;hb=bfdf836da9cf5d0ebd1d6a50c0174bb5b3922d52;hp=fd6d3a26799c0403fa1ecee27188205407658591;hpb=0d149e52e6d3326730c6a5e688d5496a7ab91a87;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index fd6d3a2..330e05a 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;
 		}
 	}
@@ -2461,6 +2457,9 @@ jQuery.macros = {
 		/**
 		 * Get the html contents of the first matched element.
 		 *
+		 * A wrapper for the innerHTML property of DOM elements, therefore
+		 * not available for XML documents.
+		 *
 		 * @example $("div").html();
 		 * @before <div><input/></div>
 		 * @result <input/>
@@ -2473,6 +2472,9 @@ jQuery.macros = {
 		/**
 		 * Set the html contents of every matched element.
 		 *
+		 * A wrapper for the innerHTML property of DOM elements, therefore
+		 * not available for XML documents.
+		 *
 		 * @example $("div").html("<b>new stuff</b>");
 		 * @before <div><input/></div>
 		 * @result <div><b>new stuff</b></div>