Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for 77558, table cells and list items getting extra br's. r=brade;sr=kin

Browse Source
This commit is contained in:
jfrancis%netscape.com 2001-05-04 21:49:48 +00:00
parent b2835efa22
commit 1f991acbd6
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/base/nsHTMLEditor.cpp
View File

@ -4427,7 +4427,7 @@ nsHTMLEditor::GetLastEditableLeaf( nsIDOMNode *aNode, nsCOMPtr<nsIDOMNode> *aOut
nsresult
nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
PRBool *outIsEmptyNode,
PRBool aMozBRDoesntCount,
PRBool aSingleBRDoesntCount,
PRBool aListOrCellNotEmpty,
PRBool aSafeToAskFrames)
{
@ -4530,14 +4530,9 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
{
// is it the node we are iterating over?
if (node.get() == aNode) break;
// is it a moz-BR and did the caller ask us not to consider those relevant?
if ((aMozBRDoesntCount && nsTextEditUtils::IsMozBR(node)))
{
// do nothing
}
else if (isBlock && !seenBR && nsTextEditUtils::IsBreak(node))
else if (aSingleBRDoesntCount && isBlock && !seenBR && nsTextEditUtils::IsBreak(node))
{
// the first br in a block doesn't count
// the first br in a block doesn't count if the caller so indicated
seenBR = PR_TRUE;
}
else
@ -4554,7 +4549,7 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
}
}
PRBool isEmptyNode;
res = IsEmptyNode(node, &isEmptyNode, aMozBRDoesntCount, aListOrCellNotEmpty);
res = IsEmptyNode(node, &isEmptyNode, aSingleBRDoesntCount, aListOrCellNotEmpty);
if (NS_FAILED(res)) return res;
if (!isEmptyNode)
{

13
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -4427,7 +4427,7 @@ nsHTMLEditor::GetLastEditableLeaf( nsIDOMNode *aNode, nsCOMPtr<nsIDOMNode> *aOut
nsresult
nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
PRBool *outIsEmptyNode,
PRBool aMozBRDoesntCount,
PRBool aSingleBRDoesntCount,
PRBool aListOrCellNotEmpty,
PRBool aSafeToAskFrames)
{
@ -4530,14 +4530,9 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
{
// is it the node we are iterating over?
if (node.get() == aNode) break;
// is it a moz-BR and did the caller ask us not to consider those relevant?
if ((aMozBRDoesntCount && nsTextEditUtils::IsMozBR(node)))
{
// do nothing
}
else if (isBlock && !seenBR && nsTextEditUtils::IsBreak(node))
else if (aSingleBRDoesntCount && isBlock && !seenBR && nsTextEditUtils::IsBreak(node))
{
// the first br in a block doesn't count
// the first br in a block doesn't count if the caller so indicated
seenBR = PR_TRUE;
}
else
@ -4554,7 +4549,7 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
}
}
PRBool isEmptyNode;
res = IsEmptyNode(node, &isEmptyNode, aMozBRDoesntCount, aListOrCellNotEmpty);
res = IsEmptyNode(node, &isEmptyNode, aSingleBRDoesntCount, aListOrCellNotEmpty);
if (NS_FAILED(res)) return res;
if (!isEmptyNode)
{