X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=1bfb4bbcfb0026d22f1afdc6fdabd029391b49f1;hb=752db8fffeffa796f5cdb5553331436c0a4cc44e;hp=daafe54aa54dc162ef4ee8387f5a9faf7550ffd4;hpb=6b08d88d04f4a41849753999e6e18126895086d0;p=jquery.git

diff --git a/src/event.js b/src/event.js
index daafe54..1bfb4bb 100644
--- a/src/event.js
+++ b/src/event.js
@@ -23,11 +23,16 @@ 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;