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

diff --git a/src/event/event.js b/src/event/event.js
index 623bcf3..bea2cba 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -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') )
@@ -577,7 +577,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 +992,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);
 		}
 	});