aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Sexton <AlexSexton@gmail.com>2011-02-17 18:01:30 -0600
committerColin Snover <github.com@zetafleet.com>2011-02-17 18:01:30 -0600
commit752db8fffeffa796f5cdb5553331436c0a4cc44e (patch)
tree3d00dfc8a4d440a3dcd943ba6cd760dc005b0349
parent4b91b918a360d056a6e4a63ee306e97f839dac59 (diff)
downloadjquery-752db8fffeffa796f5cdb5553331436c0a4cc44e.tar.gz
jquery-752db8fffeffa796f5cdb5553331436c0a4cc44e.zip
A temporary workaround for #8018 that avoids any chance of compatibility-breaking changes until a proper fix can be landed in 1.6.
-rw-r--r--src/event.js13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/event.js b/src/event.js
index daafe54aa..1bfb4bbcf 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;