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

rewrote GetFirstEditableNode() / GetLastEditableNode(). This fixes bugs: 18922, 18938, 18723; r=floppy moose

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@53769 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com 1999-11-17 11:03:25 +00:00
parent 9632e323b9
commit 07d4e1f07d
4 changed files with 58 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
mozilla/editor/base/nsEditor.cpp
View File

@ -671,7 +671,7 @@ NS_IMETHODIMP nsEditor::BeginningOfDocument()
{
// Get the first child of the body node:
nsCOMPtr<nsIDOMNode> firstNode;
result = GetFirstEditableNode(bodyNode, getter_AddRefs(firstNode));
result = GetFirstEditableNode(bodyNode, &firstNode);
if (firstNode)
{
// if firstNode is text, set selection to beginning of the text node
@ -722,8 +722,8 @@ NS_IMETHODIMP nsEditor::EndOfDocument()
result = nodeList->Item(0, getter_AddRefs(bodyNode));
if ((NS_SUCCEEDED(result)) && bodyNode)
{
nsCOMPtr<nsIDOMNode> lastChild; // = GetDeepLastChild(bodyNode);
result = GetLastEditableNode(bodyNode, getter_AddRefs(lastChild));
nsCOMPtr<nsIDOMNode> lastChild;
result = GetLastEditableNode(bodyNode, &lastChild);
if ((NS_SUCCEEDED(result)) && lastChild)
{
// See if the last child is a text node; if so, set offset:
@ -1767,85 +1767,47 @@ NS_IMETHODIMP nsEditor::SelectEntireDocument(nsIDOMSelection *aSelection)
}
nsresult nsEditor::GetFirstEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outFirstNode)
nsresult nsEditor::GetFirstEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outFirstNode)
{
if (!aRoot || !outFirstNode) return NS_ERROR_NULL_POINTER;
*outFirstNode = nsnull;
nsCOMPtr<nsIContentIterator> iter;
nsresult rv = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull,
nsIContentIterator::GetIID(),
getter_AddRefs(iter));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIContent> contentRoot = do_QueryInterface(aRoot);
rv = iter->Init(contentRoot);
nsCOMPtr<nsIDOMNode> node,next;
nsresult rv = GetLeftmostChild(aRoot, getter_AddRefs(node));
if (NS_FAILED(rv)) return rv;
iter->MakePre();
while (iter->IsDone() == NS_ENUMERATOR_FALSE)
if (node && !IsEditable(node))
{
nsCOMPtr<nsIContent> curNode;
rv = iter->CurrentNode(getter_AddRefs(curNode));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDOMNode> domNode = do_QueryInterface(curNode);
if (domNode)
{ // we have a DOM node, see if it is a leaf node
PRBool canContainChildren;
curNode->CanContainChildren(canContainChildren);
if ((PR_FALSE==canContainChildren) || IsTextNode(domNode))
{ // we have a leaf node, if it's editable, return it.
if (IsEditable(domNode))
{
*outFirstNode = domNode;
NS_ADDREF(*outFirstNode);
return NS_OK;
}
}
}
iter->Next();
rv = GetNextNode(node, PR_TRUE, getter_AddRefs(next));
node = next;
}
return NS_OK;
*outFirstNode = node;
return rv;
}
nsresult nsEditor::GetLastEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outLastNode)
nsresult nsEditor::GetLastEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outLastNode)
{
if (!aRoot || !outLastNode) return NS_ERROR_NULL_POINTER;
*outLastNode = nsnull;
nsCOMPtr<nsIContentIterator> iter;
nsresult rv = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull,
nsIContentIterator::GetIID(),
getter_AddRefs(iter));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIContent> contentRoot = do_QueryInterface(aRoot);
rv = iter->Init(contentRoot);
nsCOMPtr<nsIDOMNode> node,next;
nsresult rv = GetRightmostChild(aRoot, getter_AddRefs(node));
if (NS_FAILED(rv)) return rv;
iter->MakePre();
iter->Last();
while (iter->IsDone() == NS_ENUMERATOR_FALSE)
if (node && !IsEditable(node))
{
nsCOMPtr<nsIContent> curNode;
rv = iter->CurrentNode(getter_AddRefs(curNode));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDOMNode> domNode = do_QueryInterface(curNode);
if (domNode && IsTextNode(domNode) && IsEditable(domNode))
{
*outLastNode = domNode;
NS_ADDREF(*outLastNode);
return NS_OK;
}
iter->Prev();
rv = GetPriorNode(node, PR_TRUE, getter_AddRefs(next));
node = next;
}
return NS_OK;
*outLastNode = node;
return rv;
}

4
mozilla/editor/base/nsEditor.h
View File

@ -568,8 +568,8 @@ public:
nsresult CountEditableChildren(nsIDOMNode *aNode, PRUint32 &outCount);
/** Find the deep first and last children. Returned nodes are AddReffed */
nsresult GetFirstEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outFirstNode);
nsresult GetLastEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outLastNode);
nsresult GetFirstEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outFirstNode);
nsresult GetLastEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outLastNode);
/** from html rules code - migration in progress */

92
mozilla/editor/libeditor/base/nsEditor.cpp
View File

@ -671,7 +671,7 @@ NS_IMETHODIMP nsEditor::BeginningOfDocument()
{
// Get the first child of the body node:
nsCOMPtr<nsIDOMNode> firstNode;
result = GetFirstEditableNode(bodyNode, getter_AddRefs(firstNode));
result = GetFirstEditableNode(bodyNode, &firstNode);
if (firstNode)
{
// if firstNode is text, set selection to beginning of the text node
@ -722,8 +722,8 @@ NS_IMETHODIMP nsEditor::EndOfDocument()
result = nodeList->Item(0, getter_AddRefs(bodyNode));
if ((NS_SUCCEEDED(result)) && bodyNode)
{
nsCOMPtr<nsIDOMNode> lastChild; // = GetDeepLastChild(bodyNode);
result = GetLastEditableNode(bodyNode, getter_AddRefs(lastChild));
nsCOMPtr<nsIDOMNode> lastChild;
result = GetLastEditableNode(bodyNode, &lastChild);
if ((NS_SUCCEEDED(result)) && lastChild)
{
// See if the last child is a text node; if so, set offset:
@ -1767,85 +1767,47 @@ NS_IMETHODIMP nsEditor::SelectEntireDocument(nsIDOMSelection *aSelection)
}
nsresult nsEditor::GetFirstEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outFirstNode)
nsresult nsEditor::GetFirstEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outFirstNode)
{
if (!aRoot || !outFirstNode) return NS_ERROR_NULL_POINTER;
*outFirstNode = nsnull;
nsCOMPtr<nsIContentIterator> iter;
nsresult rv = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull,
nsIContentIterator::GetIID(),
getter_AddRefs(iter));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIContent> contentRoot = do_QueryInterface(aRoot);
rv = iter->Init(contentRoot);
nsCOMPtr<nsIDOMNode> node,next;
nsresult rv = GetLeftmostChild(aRoot, getter_AddRefs(node));
if (NS_FAILED(rv)) return rv;
iter->MakePre();
while (iter->IsDone() == NS_ENUMERATOR_FALSE)
if (node && !IsEditable(node))
{
nsCOMPtr<nsIContent> curNode;
rv = iter->CurrentNode(getter_AddRefs(curNode));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDOMNode> domNode = do_QueryInterface(curNode);
if (domNode)
{ // we have a DOM node, see if it is a leaf node
PRBool canContainChildren;
curNode->CanContainChildren(canContainChildren);
if ((PR_FALSE==canContainChildren) || IsTextNode(domNode))
{ // we have a leaf node, if it's editable, return it.
if (IsEditable(domNode))
{
*outFirstNode = domNode;
NS_ADDREF(*outFirstNode);
return NS_OK;
}
}
}
iter->Next();
rv = GetNextNode(node, PR_TRUE, getter_AddRefs(next));
node = next;
}
return NS_OK;
*outFirstNode = node;
return rv;
}
nsresult nsEditor::GetLastEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outLastNode)
nsresult nsEditor::GetLastEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outLastNode)
{
if (!aRoot || !outLastNode) return NS_ERROR_NULL_POINTER;
*outLastNode = nsnull;
nsCOMPtr<nsIContentIterator> iter;
nsresult rv = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull,
nsIContentIterator::GetIID(),
getter_AddRefs(iter));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIContent> contentRoot = do_QueryInterface(aRoot);
rv = iter->Init(contentRoot);
nsCOMPtr<nsIDOMNode> node,next;
nsresult rv = GetRightmostChild(aRoot, getter_AddRefs(node));
if (NS_FAILED(rv)) return rv;
iter->MakePre();
iter->Last();
while (iter->IsDone() == NS_ENUMERATOR_FALSE)
if (node && !IsEditable(node))
{
nsCOMPtr<nsIContent> curNode;
rv = iter->CurrentNode(getter_AddRefs(curNode));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDOMNode> domNode = do_QueryInterface(curNode);
if (domNode && IsTextNode(domNode) && IsEditable(domNode))
{
*outLastNode = domNode;
NS_ADDREF(*outLastNode);
return NS_OK;
}
iter->Prev();
rv = GetPriorNode(node, PR_TRUE, getter_AddRefs(next));
node = next;
}
return NS_OK;
*outLastNode = node;
return rv;
}

4
mozilla/editor/libeditor/base/nsEditor.h
View File

@ -568,8 +568,8 @@ public:
nsresult CountEditableChildren(nsIDOMNode *aNode, PRUint32 &outCount);
/** Find the deep first and last children. Returned nodes are AddReffed */
nsresult GetFirstEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outFirstNode);
nsresult GetLastEditableNode(nsIDOMNode *aRoot, nsIDOMNode* *outLastNode);
nsresult GetFirstEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outFirstNode);
nsresult GetLastEditableNode(nsIDOMNode *aRoot, nsCOMPtr<nsIDOMNode> *outLastNode);
/** from html rules code - migration in progress */