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

fixed IsEditable again, based on new info. 

Now, only \n are held in the content model, making the original
implementation correct.
a=chofmann, r=akkana
This commit is contained in:
buster%netscape.com 1999-09-23 19:08:42 +00:00
Родитель 92745287f7
Коммит ac6d0d1a0f
2 изменённых файлов: 4 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -939,7 +939,7 @@ nsEditor::InsertFormattingForNode(nsIDOMNode* aNode)
// XXX just insert a newline before and after each newly inserted tag.
//
nsAutoString str (NS_LINEBREAK);
nsAutoString str ("\n");
// After the close tag
//res = InsertNoneditableTextNode(parent, offset+1, str);
@ -2827,12 +2827,6 @@ nsEditor::IsEditable(nsIDOMNode *aNode)
}
}
// this next block testing for char data is ifdef'd out
// because it's unclear what whitespace constitutes "not editable"
// it's just an optimization, which makes the assumption that
// scanning the text is faster than asking layout if the text has a frame
// the last block will do this for all content, including text
#ifdef BUSTER_PERFORMANCE
// it's not the bogus node, so see if it is an irrelevant text node
if (PR_TRUE==IsTextNode(aNode))
{
@ -2852,14 +2846,13 @@ nsEditor::IsEditable(nsIDOMNode *aNode)
for (i=0; i<length; i++)
{
PRUnichar character = data.CharAt(i);
if (('\n'!=character) && ('\r'!=character)) {
if ('\n'!=character) {
return PR_TRUE;
}
}
return PR_FALSE;
}
}
#endif
// we got this far, so see if it has a frame. If so, we'll edit it.
nsIFrame *resultFrame;

11
editor/libeditor/base/nsEditor.cpp
Просмотреть файл

@ -939,7 +939,7 @@ nsEditor::InsertFormattingForNode(nsIDOMNode* aNode)
// XXX just insert a newline before and after each newly inserted tag.
//
nsAutoString str (NS_LINEBREAK);
nsAutoString str ("\n");
// After the close tag
//res = InsertNoneditableTextNode(parent, offset+1, str);
@ -2827,12 +2827,6 @@ nsEditor::IsEditable(nsIDOMNode *aNode)
}
}
// this next block testing for char data is ifdef'd out
// because it's unclear what whitespace constitutes "not editable"
// it's just an optimization, which makes the assumption that
// scanning the text is faster than asking layout if the text has a frame
// the last block will do this for all content, including text
#ifdef BUSTER_PERFORMANCE
// it's not the bogus node, so see if it is an irrelevant text node
if (PR_TRUE==IsTextNode(aNode))
{
@ -2852,14 +2846,13 @@ nsEditor::IsEditable(nsIDOMNode *aNode)
for (i=0; i<length; i++)
{
PRUnichar character = data.CharAt(i);
if (('\n'!=character) && ('\r'!=character)) {
if ('\n'!=character) {
return PR_TRUE;
}
}
return PR_FALSE;
}
}
#endif
// we got this far, so see if it has a frame. If so, we'll edit it.
nsIFrame *resultFrame;