Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 07:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rest of fix for bug 30763

Browse Source
This commit is contained in:
jfrancis%netscape.com 2000-05-05 21:57:58 +00:00
parent 9d82e3076d
commit eb2ab3d2ee
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/base/nsTextEditRules.cpp
View File

@ -469,6 +469,11 @@ nsTextEditRules::WillInsertBreak(nsIDOMSelection *aSelection, PRBool *aCancel, P
res = mEditor->SplitNodeDeep(preNode, selNode, selOffset, &newOffset, &outLeftNode, &outRightNode);
if (NS_FAILED(res)) return res;
PRBool bIsEmptyNode;
// rememeber parent of selNode now, since we might delete selNode below
res = preNode->GetParentNode(getter_AddRefs(selNode));
if (NS_FAILED(res)) return res;
if (outLeftNode)
{
res = IsEmptyNode(outLeftNode, &bIsEmptyNode, PR_TRUE, PR_FALSE);
@ -477,7 +482,7 @@ nsTextEditRules::WillInsertBreak(nsIDOMSelection *aSelection, PRBool *aCancel, P
}
if (outRightNode)
{
// HACK alert: consume a br if there s one at front of node
// HACK alert: consume a br if there is one at front of node
nsCOMPtr<nsIDOMNode> firstNode;
res = mEditor->GetFirstEditableNode(outRightNode, &firstNode);
if (firstNode && nsHTMLEditUtils::IsBreak(firstNode))
@ -489,8 +494,6 @@ nsTextEditRules::WillInsertBreak(nsIDOMSelection *aSelection, PRBool *aCancel, P
if (NS_FAILED(res)) return res;
if (bIsEmptyNode) mEditor->DeleteNode(outRightNode);
}
res = preNode->GetParentNode(getter_AddRefs(selNode));
if (NS_FAILED(res)) return res;
nsCOMPtr<nsIDOMNode> brNode;
// last ePrevious param causes selection to be set before the break
res = mEditor->CreateBR(selNode, newOffset, &brNode, nsIEditor::ePrevious);

9
editor/libeditor/text/nsTextEditRules.cpp
View File

@ -469,6 +469,11 @@ nsTextEditRules::WillInsertBreak(nsIDOMSelection *aSelection, PRBool *aCancel, P
res = mEditor->SplitNodeDeep(preNode, selNode, selOffset, &newOffset, &outLeftNode, &outRightNode);
if (NS_FAILED(res)) return res;
PRBool bIsEmptyNode;
// rememeber parent of selNode now, since we might delete selNode below
res = preNode->GetParentNode(getter_AddRefs(selNode));
if (NS_FAILED(res)) return res;
if (outLeftNode)
{
res = IsEmptyNode(outLeftNode, &bIsEmptyNode, PR_TRUE, PR_FALSE);
@ -477,7 +482,7 @@ nsTextEditRules::WillInsertBreak(nsIDOMSelection *aSelection, PRBool *aCancel, P
}
if (outRightNode)
{
// HACK alert: consume a br if there s one at front of node
// HACK alert: consume a br if there is one at front of node
nsCOMPtr<nsIDOMNode> firstNode;
res = mEditor->GetFirstEditableNode(outRightNode, &firstNode);
if (firstNode && nsHTMLEditUtils::IsBreak(firstNode))
@ -489,8 +494,6 @@ nsTextEditRules::WillInsertBreak(nsIDOMSelection *aSelection, PRBool *aCancel, P
if (NS_FAILED(res)) return res;
if (bIsEmptyNode) mEditor->DeleteNode(outRightNode);
}
res = preNode->GetParentNode(getter_AddRefs(selNode));
if (NS_FAILED(res)) return res;
nsCOMPtr<nsIDOMNode> brNode;
// last ePrevious param causes selection to be set before the break
res = mEditor->CreateBR(selNode, newOffset, &brNode, nsIEditor::ePrevious);