Prevent onunloads from bubbling.

git-svn-id: svn://10.0.0.236/trunk@31958 18797224-902f-48f8-a5cc-f745e15eee43
1999-05-17 22:14:16 +00:00
parent e174e92991
commit 24aec08ccf
2 changed files with 4 additions and 2 deletions
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -2335,7 +2335,8 @@ nsWebShell::OnStartDocumentLoad(nsIDocumentLoader* loader,
  nsIDocumentViewer* docViewer;
  nsresult rv = NS_ERROR_FAILURE;

-  if (nsnull != mScriptGlobal) {
+  if ((nsnull != mScriptGlobal) &&
+      (loader == mDocLoader)) {
    if (nsnull != mContentViewer && 
        NS_OK == mContentViewer->QueryInterface(kIDocumentViewerIID, (void**)&docViewer)) {
      nsIPresContext *presContext;