X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjquery%2Fjquery.js;h=4164f639087cfc6afab5190a8e01e90c35ed96f7;hb=dc6f9cfc9cd0e2393b8f3087d8fcfa8e03260d4c;hp=0c99d047c9857c74738353e4132374f556f17caa;hpb=c95283119c423ef2d3ff842edb2797f31aff587c;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 0c99d04..4164f63 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -863,7 +863,7 @@ jQuery.fn = jQuery.prototype = {
 				for ( var i = 0; i < t.length; i++ )
 					if ( jQuery.filter(t[i],[a]).r.length )
 						return a;
-				return false;
+				return null;
 			}) ||
 
 			t.constructor == Boolean &&
@@ -1959,9 +1959,16 @@ jQuery.extend({
 		fix: function(event) {
 			// check IE
 			if(jQuery.browser.msie) {
-				// fix target property
-				event.target = event.srcElement;
-				
+				// fix target property, if available
+				// check prevents overwriting of fake target coming from trigger
+				if(event.srcElement)
+					event.target = event.srcElement;
+					
+				// calculate pageX/Y
+				var e = document.documentElement, b = document.body;
+				event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft);
+				event.pageY = event.clientY + (e.scrollTop || b.scrollTop);
+					
 			// check safari and if target is a textnode
 			} else if(jQuery.browser.safari && event.target.nodeType == 3) {
 				// target is readonly, clone the event object
@@ -1980,7 +1987,7 @@ jQuery.extend({
 				event.stopPropagation = function() {
 					this.cancelBubble = true;
 				};
-			
+				
 			return event;
 		}
 	}