Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 09:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug 9287. Reviewed by mjudge, approved by chofmann

Browse Source
This commit is contained in:
cmanske%netscape.com 1999-07-08 03:28:34 +00:00
parent 094d857717
commit b4cf103e73
2 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
editor/base/nsHTMLEditor.cpp
View File

@ -2136,13 +2136,40 @@ nsHTMLEditor::CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement*
newElement->SetAttribute("height","40px");
newElement->SetAttribute("valign","top");
// Insert the default nbsp into the cell
nsCOMPtr<nsIDOMText>newTextNode;
nsresult result = mDoc->CreateTextNode("x", getter_AddRefs(newTextNode));
if (NS_SUCCEEDED(result) && newTextNode)
// Insert the default space in a cell so border displays
nsCOMPtr<nsIDOMNode> newCellNode = do_QueryInterface(newElement);
if (newCellNode)
{
nsCOMPtr<nsIDOMNode>resultNode;
result = newElement->AppendChild(newTextNode, getter_AddRefs(resultNode));
// First create a parent paragraph node
// THIS SHOULD BE A RULE METHOD -- SOMETHING LIKE CreateParagraphNode
nsCOMPtr<nsIDOMElement> mozDivElement;
nsresult result = mDoc->CreateElement("div", getter_AddRefs(mozDivElement));
if (NS_SUCCEEDED(result) && mozDivElement)
{
// Set the 'class' attribute needed so Composer 4.x doesn't eat the div
mozDivElement->SetAttribute("class", "moz-p");
nsCOMPtr<nsIDOMNode>resultNode;
nsCOMPtr<nsIDOMNode> mozDivNode = do_QueryInterface(mozDivElement);
result = newCellNode->AppendChild(mozDivNode, getter_AddRefs(resultNode));
if (NS_SUCCEEDED(result) && resultNode)
{
// Append a text node
nsCOMPtr<nsIDOMText>newTextNode;
nsString space;
// Set contents to the &nbsp character by concatanating the char code
space += 160;
result = mDoc->CreateTextNode(space, getter_AddRefs(newTextNode));
if (NS_SUCCEEDED(result) && newTextNode)
{
nsCOMPtr<nsIDOMNode>resultNode2;
result = mozDivNode->AppendChild(newTextNode, getter_AddRefs(resultNode2));
}
}
}
}
}
// ADD OTHER DEFAULT ATTRIBUTES HERE
@ -2242,23 +2269,16 @@ nsHTMLEditor::InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection)
res = InsertNode(aElement, parentSelectedNode, offsetOfNewNode);
} else {
// Inserting a BLOCK element:
nsCOMPtr<nsIDOMNode> splitPointParent;
nsresult result = parentSelectedNode->GetParentNode(getter_AddRefs(splitPointParent));
if (NS_SUCCEEDED(result) && splitPointParent)
// TODO: Start with parentSelectedNode and check if its a block that can accept the
// block node we want to insert as its child. For initial testing, assume its OK
//
// Get the parent of the paragraph/container
nsCOMPtr<nsIDOMNode> parentNode;
parentSelectedNode->GetParentNode(getter_AddRefs(parentNode));
res = SplitNodeDeep(parentSelectedNode, parentSelectedNode, offsetOfNewNode);
if (NS_SUCCEEDED(res))
{
#if 0
nsCOMPtr<nsIDOMNode> node;
PRInt32 offset;
// Note: 2nd param is ptr to nsCOMPtr
res = GetStartNodeAndOffset(selection, &node, &offset);
if (NS_SUCCEEDED(result) && parent)
{
}
#endif
res = SplitNodeDeep(parentSelectedNode, splitPointParent, offsetOfNewNode);
// if (NS_SUCCEEDED(result))
// res = InsertNode(aElement, parentSelectedNode, 0);
res = InsertNode(aElement, parentSelectedNode, offsetOfNewNode);
}
}
}
@ -2461,7 +2481,7 @@ nsHTMLEditor::SetCaretAfterElement(nsIDOMElement* aElement)
if (NS_SUCCEEDED(res))
{
// Collapse selection to just after desired element,
selection->Collapse(parent, offsetInParent);
selection->Collapse(parent, offsetInParent+1);
}
}
}

66
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -2136,13 +2136,40 @@ nsHTMLEditor::CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement*
newElement->SetAttribute("height","40px");
newElement->SetAttribute("valign","top");
// Insert the default nbsp into the cell
nsCOMPtr<nsIDOMText>newTextNode;
nsresult result = mDoc->CreateTextNode("x", getter_AddRefs(newTextNode));
if (NS_SUCCEEDED(result) && newTextNode)
// Insert the default space in a cell so border displays
nsCOMPtr<nsIDOMNode> newCellNode = do_QueryInterface(newElement);
if (newCellNode)
{
nsCOMPtr<nsIDOMNode>resultNode;
result = newElement->AppendChild(newTextNode, getter_AddRefs(resultNode));
// First create a parent paragraph node
// THIS SHOULD BE A RULE METHOD -- SOMETHING LIKE CreateParagraphNode
nsCOMPtr<nsIDOMElement> mozDivElement;
nsresult result = mDoc->CreateElement("div", getter_AddRefs(mozDivElement));
if (NS_SUCCEEDED(result) && mozDivElement)
{
// Set the 'class' attribute needed so Composer 4.x doesn't eat the div
mozDivElement->SetAttribute("class", "moz-p");
nsCOMPtr<nsIDOMNode>resultNode;
nsCOMPtr<nsIDOMNode> mozDivNode = do_QueryInterface(mozDivElement);
result = newCellNode->AppendChild(mozDivNode, getter_AddRefs(resultNode));
if (NS_SUCCEEDED(result) && resultNode)
{
// Append a text node
nsCOMPtr<nsIDOMText>newTextNode;
nsString space;
// Set contents to the &nbsp character by concatanating the char code
space += 160;
result = mDoc->CreateTextNode(space, getter_AddRefs(newTextNode));
if (NS_SUCCEEDED(result) && newTextNode)
{
nsCOMPtr<nsIDOMNode>resultNode2;
result = mozDivNode->AppendChild(newTextNode, getter_AddRefs(resultNode2));
}
}
}
}
}
// ADD OTHER DEFAULT ATTRIBUTES HERE
@ -2242,23 +2269,16 @@ nsHTMLEditor::InsertElement(nsIDOMElement* aElement, PRBool aDeleteSelection)
res = InsertNode(aElement, parentSelectedNode, offsetOfNewNode);
} else {
// Inserting a BLOCK element:
nsCOMPtr<nsIDOMNode> splitPointParent;
nsresult result = parentSelectedNode->GetParentNode(getter_AddRefs(splitPointParent));
if (NS_SUCCEEDED(result) && splitPointParent)
// TODO: Start with parentSelectedNode and check if its a block that can accept the
// block node we want to insert as its child. For initial testing, assume its OK
//
// Get the parent of the paragraph/container
nsCOMPtr<nsIDOMNode> parentNode;
parentSelectedNode->GetParentNode(getter_AddRefs(parentNode));
res = SplitNodeDeep(parentSelectedNode, parentSelectedNode, offsetOfNewNode);
if (NS_SUCCEEDED(res))
{
#if 0
nsCOMPtr<nsIDOMNode> node;
PRInt32 offset;
// Note: 2nd param is ptr to nsCOMPtr
res = GetStartNodeAndOffset(selection, &node, &offset);
if (NS_SUCCEEDED(result) && parent)
{
}
#endif
res = SplitNodeDeep(parentSelectedNode, splitPointParent, offsetOfNewNode);
// if (NS_SUCCEEDED(result))
// res = InsertNode(aElement, parentSelectedNode, 0);
res = InsertNode(aElement, parentSelectedNode, offsetOfNewNode);
}
}
}
@ -2461,7 +2481,7 @@ nsHTMLEditor::SetCaretAfterElement(nsIDOMElement* aElement)
if (NS_SUCCEEDED(res))
{
// Collapse selection to just after desired element,
selection->Collapse(parent, offsetInParent);
selection->Collapse(parent, offsetInParent+1);
}
}
}