From 24aec08ccfe3f3c4ba3b71900b32a893104864f8 Mon Sep 17 00:00:00 2001 From: "vidur%netscape.com" Date: Mon, 17 May 1999 22:14:16 +0000 Subject: [PATCH] Prevent onunloads from bubbling. git-svn-id: svn://10.0.0.236/trunk@31958 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 3 ++- mozilla/webshell/src/nsWebShell.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 831af1559df..858e5d0e571 100644 --- 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; diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 831af1559df..858e5d0e571 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/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;