зеркало из https://github.com/mozilla/gecko-dev.git
Fix for 29843 -- caret disappears on delete. r=jfrancis
This commit is contained in:
Родитель
1b34326be4
Коммит
27b5192b2c
|
@ -5661,7 +5661,9 @@ nsHTMLEditor::CollapseAdjacentTextNodes(nsIDOMRange *aInRange)
|
||||||
|
|
||||||
iter->Init(aInRange);
|
iter->Init(aInRange);
|
||||||
nsCOMPtr<nsIContent> content;
|
nsCOMPtr<nsIContent> content;
|
||||||
result = iter->CurrentNode(getter_AddRefs(content));
|
result = iter->CurrentNode(getter_AddRefs(content));
|
||||||
|
if (!content) return NS_OK;
|
||||||
|
|
||||||
while (NS_ENUMERATOR_FALSE == iter->IsDone())
|
while (NS_ENUMERATOR_FALSE == iter->IsDone())
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsIDOMCharacterData> text = do_QueryInterface(content);
|
nsCOMPtr<nsIDOMCharacterData> text = do_QueryInterface(content);
|
||||||
|
|
|
@ -5661,7 +5661,9 @@ nsHTMLEditor::CollapseAdjacentTextNodes(nsIDOMRange *aInRange)
|
||||||
|
|
||||||
iter->Init(aInRange);
|
iter->Init(aInRange);
|
||||||
nsCOMPtr<nsIContent> content;
|
nsCOMPtr<nsIContent> content;
|
||||||
result = iter->CurrentNode(getter_AddRefs(content));
|
result = iter->CurrentNode(getter_AddRefs(content));
|
||||||
|
if (!content) return NS_OK;
|
||||||
|
|
||||||
while (NS_ENUMERATOR_FALSE == iter->IsDone())
|
while (NS_ENUMERATOR_FALSE == iter->IsDone())
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsIDOMCharacterData> text = do_QueryInterface(content);
|
nsCOMPtr<nsIDOMCharacterData> text = do_QueryInterface(content);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче