X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=5d8e89aa84c535d89815b046e6eb482cb771f232;hb=af329ed00b0499a8d393f132d2765d02144f6820;hp=bea2cbac7c6a093b9705b60464e50f894870f07e;hpb=f025ed878bcf610971f294fd931edfe30aa18a9e;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index bea2cba..5d8e89a 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -64,7 +64,7 @@ jQuery.event = {
 			// And bind the global event handler to the element
 			if (element.addEventListener)
 				element.addEventListener(type, element.$handle, false);
-			else if (element.attachEvent)
+			else
 				element.attachEvent("on" + type, element.$handle);
 		}
 
@@ -112,7 +112,7 @@ jQuery.event = {
 				if ( !ret ) {
 					if (element.removeEventListener)
 						element.removeEventListener(type, element.$handle, false);
-					else if (element.detachEvent)
+					else
 						element.detachEvent("on" + type, element.$handle);
 					ret = null;
 					delete events[type];
@@ -226,9 +226,9 @@ jQuery.event = {
 
 		// Calculate pageX/Y if missing and clientX/Y available
 		if ( event.pageX == null && event.clientX != null ) {
-			var e = document.documentElement || document.body;
-			event.pageX = event.clientX + e.scrollLeft;
-			event.pageY = event.clientY + e.scrollTop;
+			var e = document.documentElement, b = document.body;
+			event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft);
+			event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop);
 		}
 			
 		// Add which for key events
@@ -539,10 +539,9 @@ jQuery.fn.extend({
 			f.apply( document, [jQuery] );
 			
 		// Otherwise, remember the function for later
-		else {
+		else
 			// Add the function to the wait list
 			jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
-		}
 	
 		return this;
 	}