mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug fix: paragraphs now merge properly.

This commit is contained in:
jfrancis%netscape.com 1999-09-10 23:32:28 +00:00
Родитель 5638b8ea91
Коммит 325a680de6
2 изменённых файлов: 38 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
editor/base/nsHTMLEditRules.cpp
Просмотреть файл

@ -2764,11 +2764,27 @@ nsHTMLEditRules::JoinNodesSmart( nsIDOMNode *aNodeLeft,
// for para's, merge deep & add a <br> after merging
res = mEditor->JoinNodeDeep(aNodeLeft, aNodeRight, aOutMergeParent, aOutMergeOffset);
if (NS_FAILED(res)) return res;
// now we need to insert a br. unfortunately, we may have to split a text node to do it.
nsCOMPtr<nsIDOMCharacterData> nodeAsText = do_QueryInterface(*aOutMergeParent);
nsAutoString brType("br");
nsCOMPtr<nsIDOMNode> brNode;
res = mEditor->CreateNode(brType, *aOutMergeParent, *aOutMergeOffset, getter_AddRefs(brNode));
// out offset _after_ <br>
*aOutMergeOffset++;
if (nodeAsText)
{
// split the text node
nsCOMPtr<nsIDOMNode> tmp;
PRInt32 offset;
res = mEditor->SplitNode(*aOutMergeParent, *aOutMergeOffset, getter_AddRefs(tmp));
if (NS_FAILED(res)) return res;
res = nsEditor::GetNodeLocation(*aOutMergeParent, &tmp, &offset);
if (NS_FAILED(res)) return res;
res = mEditor->CreateNode(brType, tmp, offset, getter_AddRefs(brNode));
*aOutMergeOffset = 0; // selection at front of righthand text node
}
else
{
res = mEditor->CreateNode(brType, *aOutMergeParent, *aOutMergeOffset, getter_AddRefs(brNode));
*aOutMergeOffset++; // out offset _after_ <br>
}
return res;
}
else if (IsList(aNodeLeft) || mEditor->IsTextNode(aNodeLeft))

22
editor/libeditor/html/nsHTMLEditRules.cpp
Просмотреть файл

@ -2764,11 +2764,27 @@ nsHTMLEditRules::JoinNodesSmart( nsIDOMNode *aNodeLeft,
// for para's, merge deep & add a <br> after merging
res = mEditor->JoinNodeDeep(aNodeLeft, aNodeRight, aOutMergeParent, aOutMergeOffset);
if (NS_FAILED(res)) return res;
// now we need to insert a br. unfortunately, we may have to split a text node to do it.
nsCOMPtr<nsIDOMCharacterData> nodeAsText = do_QueryInterface(*aOutMergeParent);
nsAutoString brType("br");
nsCOMPtr<nsIDOMNode> brNode;
res = mEditor->CreateNode(brType, *aOutMergeParent, *aOutMergeOffset, getter_AddRefs(brNode));
// out offset _after_ <br>
*aOutMergeOffset++;
if (nodeAsText)
{
// split the text node
nsCOMPtr<nsIDOMNode> tmp;
PRInt32 offset;
res = mEditor->SplitNode(*aOutMergeParent, *aOutMergeOffset, getter_AddRefs(tmp));
if (NS_FAILED(res)) return res;
res = nsEditor::GetNodeLocation(*aOutMergeParent, &tmp, &offset);
if (NS_FAILED(res)) return res;
res = mEditor->CreateNode(brType, tmp, offset, getter_AddRefs(brNode));
*aOutMergeOffset = 0; // selection at front of righthand text node
}
else
{
res = mEditor->CreateNode(brType, *aOutMergeParent, *aOutMergeOffset, getter_AddRefs(brNode));
*aOutMergeOffset++; // out offset _after_ <br>
}
return res;
}
else if (IsList(aNodeLeft) || mEditor->IsTextNode(aNodeLeft))