Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for:

Browse Source 
26624 - lists and inline style dont get along
r=sfraser; a=rickg


git-svn-id: svn://10.0.0.236/trunk@61265 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com
2000-02-18 01:10:21 +00:00
parent a5d39e82cd
commit 47730b5d52
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/editor/base/nsHTMLEditRules.cpp
View File

@@ -1675,11 +1675,18 @@ nsHTMLEditRules::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 && nsHTMLEditUtils::IsMozBR(node)))
if (!(aMozBRDoesntCount && nsHTMLEditUtils::IsMozBR(node)))
{
// otherwise it ain't empty
*outIsEmptyNode = PR_FALSE;
break;
// is it an empty node of some sort?
PRBool isEmptyNode;
res = IsEmptyNode(node, &isEmptyNode, aMozBRDoesntCount, aListItemsNotEmpty);
if (NS_FAILED(res)) return res;
if (!isEmptyNode)
{
// otherwise it ain't empty
*outIsEmptyNode = PR_FALSE;
break;
}
}
}
}

15
mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
View File

@@ -1675,11 +1675,18 @@ nsHTMLEditRules::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 && nsHTMLEditUtils::IsMozBR(node)))
if (!(aMozBRDoesntCount && nsHTMLEditUtils::IsMozBR(node)))
{
// otherwise it ain't empty
*outIsEmptyNode = PR_FALSE;
break;
// is it an empty node of some sort?
PRBool isEmptyNode;
res = IsEmptyNode(node, &isEmptyNode, aMozBRDoesntCount, aListItemsNotEmpty);
if (NS_FAILED(res)) return res;
if (!isEmptyNode)
{
// otherwise it ain't empty
*outIsEmptyNode = PR_FALSE;
break;
}
}
}
}