Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed IsEditable again, based on new info.

Browse Source 
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
parent 92745287f7
commit ac6d0d1a0f
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/base/nsEditor.cpp
View File

@ -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
View File

@ -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;