fix for 43903; making a list after inline contnet doesnt work

git-svn-id: svn://10.0.0.236/trunk@74125 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com
2000-07-12 23:21:49 +00:00
parent a5bf6f1545
commit 57a7c5fa33
2 changed files with 18 additions and 16 deletions

View File

@@ -3729,14 +3729,6 @@ nsHTMLEditRules::ShouldMakeEmptyBlock(nsIDOMSelection *aSelection,
}
}
// are we in a textnode or inline node?
if (!nsEditor::IsBlockNode(parent))
{
// we must be in a text or inline node - convert existing block
*outMakeEmpty = PR_FALSE;
return res;
}
// is it after a <br> with no inline nodes after it, or a <br> after it??
if (offset)
{
@@ -3771,6 +3763,15 @@ nsHTMLEditRules::ShouldMakeEmptyBlock(nsIDOMSelection *aSelection,
}
}
}
// are we in a textnode or inline node?
if (!nsEditor::IsBlockNode(parent))
{
// we must be in a text or inline node - convert existing block
*outMakeEmpty = PR_FALSE;
return res;
}
}
// otherwise transform an existing block
*outMakeEmpty = PR_FALSE;