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

28598: Do dom linebreak conversion on the string before inserting it in the editor.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@64805 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
akkana%netscape.com
2000-04-01 00:04:46 +00:00
parent 5806b724a1
commit a66b5d430f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp
View File

@@ -1349,12 +1349,15 @@ void nsGfxTextControlFrame::SetTextControlFrameState(const nsString& aValue)
if (PR_TRUE==IsSingleLineTextControl()) {
RemoveNewlines(currentValue);
}
else {
// \r is an illegal character in the dom, so get rid of them:
nsFormControlHelper::PlatformToDOMLineBreaks(currentValue);
}
if (PR_FALSE==currentValue.Equals(aValue)) // this is necessary to avoid infinite recursion
{
// \r is an illegal character in the dom, but people use them,
// so convert windows and mac platform linebreaks to \n:
// Unfortunately aValue is declared const, so we have to copy
// in order to do this substitution.
currentValue = aValue;
nsFormControlHelper::PlatformToDOMLineBreaks(currentValue);
nsCOMPtr<nsIDOMDocument>domDoc;
result = mEditor->GetDocument(getter_AddRefs(domDoc));
if (NS_FAILED(result)) return;
@@ -1373,8 +1376,8 @@ void nsGfxTextControlFrame::SetTextControlFrameState(const nsString& aValue)
mEditor->SetFlags(flags);
mEditor->SelectAll();
mEditor->DeleteSelection(nsIEditor::eNone);
htmlEditor->InsertText(aValue);
mEditor->SetFlags(savedFlags);
htmlEditor->InsertText(currentValue);
mEditor->SetFlags(savedFlags);
}
}
else {