From 060ad9b0b259a002407ba9c8e35cafd7bc90bae5 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 2 May 2012 16:54:02 +0100 Subject: [PATCH] Effects: Use a try/catch block to prevent security veto. Fixed #8288 - focus fix causes Firefox Security Manager veto. --- ui/jquery.effects.core.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 5cf95696dcf..a534fdb8c80 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -431,9 +431,12 @@ $.extend( $.effects, { element.wrap( wrapper ); // Fixes #7595 - Elements lose focus when wrapped. - if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { - $( active ).focus(); - } + // try/catch fixes #8288 + try { + if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { + $( active ).focus(); + } + } catch ( e ) {} wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element @@ -472,9 +475,12 @@ $.extend( $.effects, { element.parent().replaceWith( element ); // Fixes #7595 - Elements lose focus when wrapped. - if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { - $( active ).focus(); - } + // try/catch fixes #8288 + try { + if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { + $( active ).focus(); + } + } catch ( e ) {} }