X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=1bfb4bbcfb0026d22f1afdc6fdabd029391b49f1;hb=a43a5ca9cf79afcd662df5b9110d7ccba45c0b53;hp=758c8f560c088740b1e03ac736e26a214f6a4c4d;hpb=12c0e1a692aa045e9d3cf166a41748d7f5fe31cc;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 758c8f5..1bfb4bb 100644
--- a/src/event.js
+++ b/src/event.js
@@ -23,17 +23,22 @@ jQuery.event = {
 			return;
 		}
 
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
-			elem = window;
+		// TODO :: Use a try/catch until it's safe to pull this out (likely 1.6)
+		// Minor release fix for bug #8018
+		try {
+			// For whatever reason, IE has trouble passing the window object
+			// around, causing it to be cloned in the process
+			if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
+				elem = window;
+			}
 		}
+		catch ( e ) {}
 
 		if ( handler === false ) {
 			handler = returnFalse;
 		} else if ( !handler ) {
 			// Fixes bug #7229. Fix recommended by jdalton
-		  return;
+			return;
 		}
 
 		var handleObjIn, handleObj;