From bd5c883b9da616e4ef17d9f65a6ecb9cf664996d Mon Sep 17 00:00:00 2001 From: "peterv%propagandism.org" Date: Tue, 3 Jul 2007 11:54:41 +0000 Subject: [PATCH] Fix for bug 386495 (Javascript is not disabled when designMode is on). r/sr=jst. git-svn-id: svn://10.0.0.236/trunk@229240 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsHTMLDocument.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 172490993fe..1634edfea5b 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -3943,11 +3943,17 @@ nsHTMLDocument::EditingStateChanged() mScriptsEnabled = tmp; + rv = docshell->SetAllowJavascript(PR_FALSE); + NS_ENSURE_SUCCESS(rv, rv); + rv = docshell->GetAllowPlugins(&tmp); NS_ENSURE_SUCCESS(rv, rv); mPluginsEnabled = tmp; + rv = docshell->SetAllowPlugins(PR_FALSE); + NS_ENSURE_SUCCESS(rv, rv); + updateState = PR_TRUE; spellRecheckAll = mEditingState == eContentEditable; }