From 2ded545a76874212e8418628d6233a28fbf8a44f Mon Sep 17 00:00:00 2001 From: "saari%netscape.com" Date: Tue, 29 May 2001 23:26:50 +0000 Subject: [PATCH] fix for 82710, r=me, sr=hyatt, a=mcafee (blocker) make sure we set the focused element to null after the viewer is totoally torn down, and after we've suppressed focus git-svn-id: svn://10.0.0.236/trunk@96029 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index a801bd8cb54..6891ff5b0a8 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3912,6 +3912,8 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer) // Suppress the command dispatcher. focusController->SetSuppressFocus(PR_TRUE, "Win32-Only Link Traversal Issue"); + // Remove focus from the element that has it + focusController->SetFocusedElement(nsnull); } } @@ -3956,11 +3958,9 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer) // See the book I wrote above regarding why the focus controller is // being used here. -- hyatt - if (focusController) { - focusController->SetFocusedElement(nsnull); + if (focusController) focusController->SetSuppressFocus(PR_FALSE, "Win32-Only Link Traversal Issue"); - } mContentViewer = aNewViewer;