X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=4b625a5b26237bc25cb7ac336fde39c49c573c9a;hb=c6db93c37374410427b0b64d19c24659fbb32754;hp=232fa277521e5cc7bc111379588d3f28505dcb73;hpb=aef1989ba74ee568f8bab3ac0967fd849816da12;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 232fa27..4b625a5 100644
--- a/src/event.js
+++ b/src/event.js
@@ -66,7 +66,7 @@ jQuery.event = {
 			if ( special.add ) {
 				var modifiedHandler = special.add.call( elem, handler, data, namespaces );
 				if ( modifiedHandler && jQuery.isFunction( modifiedHandler ) ) {
-					modifiedHandler.guid = handler.guid;
+					modifiedHandler.guid = modifiedHandler.guid || handler.guid;
 					handler = modifiedHandler;
 				}
 			}
@@ -351,8 +351,8 @@ jQuery.event = {
 		// Calculate pageX/Y if missing and clientX/Y available
 		if ( event.pageX == null && event.clientX != null ) {
 			var doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc.clientTop  || 0);
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
 		}
 
 		// Add which for key events