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

Backout previous checkin/fix for 46209 & 22227 since in some instances

Browse Source 
the frame data it relies on does not contain valid info. This causes
data loss in some cases like when making text bold.
a=granrose


git-svn-id: svn://10.0.0.236/trunk@74816 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kin%netscape.com
2000-07-26 18:52:59 +00:00
parent 22c2958b41
commit 4554a01d45
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/editor/base/nsHTMLEditor.cpp
View File

@@ -7160,6 +7160,7 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
nsCOMPtr<nsIDOMCharacterData>nodeAsText;
nodeAsText = do_QueryInterface(node);
nodeAsText->GetLength(&length);
#ifdef NOT_QUITE_READY_FOR_PRIMETIME
nsCOMPtr<nsISelectionController> selCon;
res = GetSelectionController(getter_AddRefs(selCon));
if (NS_FAILED(res)) return res;
@@ -7177,6 +7178,9 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
*outIsEmptyNode = PR_FALSE;
break;
}
#else
if (length) *outIsEmptyNode = PR_FALSE;
#endif
}
else // an editable, non-text node. we aren't an empty block
{

4
mozilla/editor/libeditor/html/nsHTMLEditor.cpp
View File

@@ -7160,6 +7160,7 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
nsCOMPtr<nsIDOMCharacterData>nodeAsText;
nodeAsText = do_QueryInterface(node);
nodeAsText->GetLength(&length);
#ifdef NOT_QUITE_READY_FOR_PRIMETIME
nsCOMPtr<nsISelectionController> selCon;
res = GetSelectionController(getter_AddRefs(selCon));
if (NS_FAILED(res)) return res;
@@ -7177,6 +7178,9 @@ nsHTMLEditor::IsEmptyNode( nsIDOMNode *aNode,
*outIsEmptyNode = PR_FALSE;
break;
}
#else
if (length) *outIsEmptyNode = PR_FALSE;
#endif
}
else // an editable, non-text node. we aren't an empty block
{