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

diff --git a/src/event/event.js b/src/event/event.js
index 623bcf3..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];
@@ -148,7 +148,7 @@ jQuery.event = {
 			data.unshift( this.fix({ type: type, target: element }) );
 
 			// Trigger the event
-			if ( (val = element.$handle.apply( element, data )) !== false )
+			if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false )
 				this.triggered = true;
 
 			if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
@@ -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;
 	}
@@ -577,7 +576,8 @@ jQuery.extend({
 				document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
 			
 			// Remove script element used by IE hack
-			jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+			if( !window.frames.length ) // don't remove if frames are present (#1187)
+				jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
 		}
 	}
 });
@@ -991,7 +991,7 @@ if (jQuery.browser.msie)
 			var els = global[type], i = els.length;
 			if ( i && type != 'unload' )
 				do
-					jQuery.event.remove(els[i-1], type);
+					els[i-1] && jQuery.event.remove(els[i-1], type);
 				while (--i);
 		}
 	});