Bug 430858, Composer is unusable (can't type anything in the window etc), r+sr=peterv, a=beltzner
git-svn-id: svn://10.0.0.236/trunk@251268 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
7094575384
commit
eca05ab3b7
@ -1025,12 +1025,22 @@ nsEditingSession::EndDocumentLoad(nsIWebProgress *aWebProgress,
|
||||
|
||||
if (makeEditable)
|
||||
{
|
||||
// do we already have an editor here?
|
||||
nsCOMPtr<nsIEditor> editor;
|
||||
rv = editorDocShell->GetEditor(getter_AddRefs(editor));
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
if (!editor)
|
||||
// To keep pre Gecko 1.9 behavior, setup editor always when
|
||||
// mMakeWholeDocumentEditable.
|
||||
PRBool needsSetup;
|
||||
if (mMakeWholeDocumentEditable) {
|
||||
needsSetup = PR_TRUE;
|
||||
} else {
|
||||
// do we already have an editor here?
|
||||
nsCOMPtr<nsIEditor> editor;
|
||||
rv = editorDocShell->GetEditor(getter_AddRefs(editor));
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
needsSetup = !editor;
|
||||
}
|
||||
|
||||
if (needsSetup)
|
||||
{
|
||||
mCanCreateEditor = PR_FALSE;
|
||||
rv = SetupEditorOnWindow(domWindow);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user