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

Fix for bug 286300 (Clean up HTML tags enum and related code). r/sr=jst, a=asa.

This commit is contained in:
peterv%propagandism.org 2005-06-16 12:58:13 +00:00
Родитель 6c3bda1208
Коммит 555cc2a1f9
12 изменённых файлов: 32 добавлений и 21 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
browser/base/content/browser.js
Просмотреть файл

@ -4932,12 +4932,14 @@ function findParentNode(node, parentNode)
node = node.parentNode;
}
while (node) {
if (node.nodeType == Node.DOCUMENT_NODE) {
return null;
}
var nodeName = node.localName;
if (!nodeName)
return null;
nodeName = nodeName.toLowerCase();
if (nodeName == "body" || nodeName == "html" ||
nodeName == "#document") {
if (nodeName == "body" || nodeName == "html") {
return null;
}
if (nodeName == parentNode)

2
browser/base/content/utilityOverlay.js
Просмотреть файл

@ -322,7 +322,7 @@ function gatherTextUnder ( root )
var depth = 1;
while ( node && depth > 0 ) {
// See if this node is text.
if ( node.nodeName == "#text" ) {
if ( node.nodeType == Node.TEXT_NODE ) {
// Add this text to our collection.
text += " " + node.data;
} else if ( node.nodeType == Node.ELEMENT_NODE

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

@ -281,7 +281,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMNode** aRowNode)
res = tableChild->GetFirstChild(getter_AddRefs(rowNode));
if (NS_FAILED(res)) return res;
// We can encounter "__moz_text" nodes here -- must find a row
// We can encounter textnodes here -- must find a row
while (rowNode && !nsHTMLEditUtils::IsTableRow(rowNode))
{
nsCOMPtr<nsIDOMNode> nextNode;
@ -300,7 +300,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMNode** aRowNode)
}
// Here if table child was a CAPTION or COLGROUP
// or child of a row parent wasn't a row (bad HTML?),
// or first child was a "__moz_text" node
// or first child was a textnode
// Look in next table child
nsCOMPtr<nsIDOMNode> nextChild;
res = tableChild->GetNextSibling(getter_AddRefs(nextChild));
@ -330,7 +330,7 @@ nsHTMLEditor::GetNextRow(nsIDOMNode* aCurrentRowNode, nsIDOMNode **aRowNode)
nsCOMPtr<nsIDOMNode> nextNode;
// Skip over any "__moz_text" nodes here
// Skip over any textnodes here
while (nextRow && !nsHTMLEditUtils::IsTableRow(nextRow))
{
res = nextRow->GetNextSibling(getter_AddRefs(nextNode));
@ -360,7 +360,7 @@ nsHTMLEditor::GetNextRow(nsIDOMNode* aCurrentRowNode, nsIDOMNode **aRowNode)
res = parentSibling->GetFirstChild(getter_AddRefs(nextRow));
if (NS_FAILED(res)) return res;
// We can encounter "__moz_text" nodes here -- must find a row
// We can encounter textnodes here -- must find a row
while (nextRow && !nsHTMLEditUtils::IsTableRow(nextRow))
{
res = nextRow->GetNextSibling(getter_AddRefs(nextNode));
@ -404,7 +404,7 @@ nsHTMLEditor::GetFirstCellInRow(nsIDOMNode* aRowNode, nsIDOMNode** aCellNode)
while (rowChild && !nsHTMLEditUtils::IsTableCell(rowChild))
{
// Skip over "__moz_text" nodes
// Skip over textnodes
nsCOMPtr<nsIDOMNode> nextChild;
res = rowChild->GetNextSibling(getter_AddRefs(nextChild));
if (NS_FAILED(res)) return res;
@ -436,7 +436,7 @@ nsHTMLEditor::GetNextCellInRow(nsIDOMNode* aCurrentCellNode, nsIDOMNode** aCellN
while (nextCell && !nsHTMLEditUtils::IsTableCell(nextCell))
{
// Skip over "__moz_text" nodes
// Skip over textnodes
nsCOMPtr<nsIDOMNode> nextChild;
res = nextCell->GetNextSibling(getter_AddRefs(nextChild));
if (NS_FAILED(res)) return res;
@ -468,7 +468,7 @@ nsHTMLEditor::GetLastCellInRow(nsIDOMNode* aRowNode, nsIDOMNode** aCellNode)
while (rowChild && !nsHTMLEditUtils::IsTableCell(rowChild))
{
// Skip over "__moz_text" nodes
// Skip over textnodes
nsCOMPtr<nsIDOMNode> previousChild;
res = rowChild->GetPreviousSibling(getter_AddRefs(previousChild));
if (NS_FAILED(res)) return res;

2
editor/ui/composer/content/EditorCommandsDebug.js
Просмотреть файл

@ -472,7 +472,7 @@ sampleJSTransaction.prototype = {
doTransaction: function()
{
if (this.mContainer.nodeName != "#text")
if (this.mContainer.nodeType != Node.TEXT_NODE)
{
// We're not in a text node, so create one and
// we'll just insert it at (mContainer, mOffset).

2
extensions/transformiix/resources/buster/DumpDOM.js
Просмотреть файл

@ -57,7 +57,7 @@ function DumpNodeAndChildren(node, prefix)
dump(" id=\"" + text + "\"");
}
if ( node.nodeName == "#text" )
if ( node.nodeType == Node.TEXT_NODE )
dump(" = \"" + node.data + "\"");
dump(">\n");

7
mailnews/compose/src/nsMsgCompose.cpp
Просмотреть файл

@ -4253,6 +4253,11 @@ nsresult nsMsgCompose::TagConvertible(nsIDOMNode *node, PRInt32 *_retval)
*_retval = nsIMsgCompConvertible::No;
PRInt16 nodeType;
rv = node->GetNodeType(&nodeType);
if (NS_FAILED(rv))
return rv;
nsAutoString element;
rv = node->GetNodeName(element);
if (NS_FAILED(rv))
@ -4260,7 +4265,7 @@ nsresult nsMsgCompose::TagConvertible(nsIDOMNode *node, PRInt32 *_retval)
nsCOMPtr<nsIDOMNode> pItem;
if (
element.LowerCaseEqualsLiteral("#text") ||
nodeType == nsIDOMNode::TEXT_NODE ||
element.LowerCaseEqualsLiteral("br") ||
element.LowerCaseEqualsLiteral("p") ||
element.LowerCaseEqualsLiteral("pre") ||

6
toolkit/components/help/content/help.js
Просмотреть файл

@ -609,12 +609,14 @@ function findParentNode(node, parentNode)
node = node.parentNode;
}
while (node) {
if (node.nodeType == Node.DOCUMENT_NODE) {
return null;
}
var nodeName = node.localName;
if (!nodeName)
return null;
nodeName = nodeName.toLowerCase();
if (nodeName == "body" || nodeName == "html" ||
nodeName == "#document") {
if (nodeName == "body" || nodeName == "html") {
return null;
}
if (nodeName == parentNode)

2
xpcom/tests/windows/nsStringTest.h
Просмотреть файл

@ -556,7 +556,7 @@ int CStringTester::TestLogical(){
}
{
nsString foo("__moz_text");
nsString foo("#text");
PRInt32 cmp=foo.Compare("pre",PR_FALSE,-1);
cmp=cmp;
}

6
xpfe/communicator/resources/content/contentAreaUtils.js
Просмотреть файл

@ -184,12 +184,14 @@ function findParentNode(node, parentNode)
node = node.parentNode;
}
while (node) {
if (node.nodeType == Node.DOCUMENT_NODE) {
return null;
}
var nodeName = node.localName;
if (!nodeName)
return null;
nodeName = nodeName.toLowerCase();
if (nodeName == "body" || nodeName == "html" ||
nodeName == "#document") {
if (nodeName == "body" || nodeName == "html") {
return null;
}
if (nodeName == parentNode)

2
xpfe/communicator/resources/content/utilityOverlay.js
Просмотреть файл

@ -447,7 +447,7 @@ function gatherTextUnder ( root )
var depth = 1;
while ( node && depth > 0 ) {
// See if this node is text.
if ( node.nodeName == "#text" ) {
if ( node.nodeType == Node.TEXT_NODE ) {
// Add this text to our collection.
text += " " + node.data;
} else if ( node.nodeType == Node.ELEMENT_NODE

2
xpfe/components/sidebar/resources/customize.js
Просмотреть файл

@ -700,7 +700,7 @@ if (!CUST_DEBUG) {
var indent = "| | | | | | | | | | | | | | | | | | | | | | | | | | | | + ";
debug(indent.substr(indent.length - depth*2) + index +
" " + node.nodeName);
if (node.nodeName != "#text") {
if (node.nodeType != Node.TEXT_NODE) {
dump_attributes(node, depth);
}
var kids = node.childNodes;

2
xpfe/components/sidebar/resources/sidebarOverlay.js
Просмотреть файл

@ -1634,7 +1634,7 @@ if (!SB_DEBUG) {
var indent = "| | | | | | | | | | | | | | | | | | | | | | | | | | | | + ";
debug(indent.substr(indent.length - depth*2) + index +
" " + node.nodeName);
if (node.nodeName != "#text") {
if (node.nodeType != Node.TEXT_NODE) {
dump_attributes(node, depth);
}
var kids = node.childNodes;