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

fix for 29320; deletion putting caret in wrong table cell

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@68292 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com
2000-05-04 23:54:00 +00:00
parent 4d610df478
commit 70ffe624ce
4 changed files with 80 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4087,10 +4087,6 @@ nsHTMLEditRules::FindNearSelectableNode(nsIDOMNode *aSelNode,
|| nsHTMLEditUtils::IsBreak(nearNode)
|| nsHTMLEditUtils::IsImage(nearNode)))
{
// dont cross any table elements
if (mEditor->IsTableElement(nearNode))
return NS_OK;
curNode = nearNode;
if (aDirection == nsIEditor::ePrevious)
res = mEditor->GetPriorHTMLNode(curNode, &nearNode);
@@ -4099,11 +4095,49 @@ nsHTMLEditRules::FindNearSelectableNode(nsIDOMNode *aSelNode,
if (NS_FAILED(res)) return res;
}
if (nearNode) *outSelectableNode = do_QueryInterface(nearNode);
if (nearNode)
{
// dont cross any table elements
PRBool bInDifTblElems;
res = InDifferentTableElements(nearNode, aSelNode, &bInDifTblElems);
if (NS_FAILED(res)) return res;
if (bInDifTblElems) return NS_OK;
// otherwise, ok, we have found a good spot to put the selection
*outSelectableNode = do_QueryInterface(nearNode);
}
return res;
}
nsresult
nsHTMLEditRules::InDifferentTableElements(nsIDOMNode *aNode1, nsIDOMNode *aNode2, PRBool *aResult)
{
if (!aNode1 || !aNode2 || !aResult) NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIDOMNode> tn1, tn2, node = aNode1, temp;
while (node && !mEditor->IsTableElement(node))
{
node->GetParentNode(getter_AddRefs(temp));
node = temp;
}
tn1 = node;
node = aNode2;
while (node && !mEditor->IsTableElement(node))
{
node->GetParentNode(getter_AddRefs(temp));
node = temp;
}
tn2 = node;
*aResult = (tn1 != tn2);
return NS_OK;
}
nsresult
nsHTMLEditRules::RemoveEmptyNodes()
{