fix for 27699: ime text insert screwed up for single line edit fields
git-svn-id: svn://10.0.0.236/trunk@60985 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -566,7 +566,11 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
|
||||
// fixes bug 21032
|
||||
// *** there's some debate about whether we should replace CRLF with spaces, or
|
||||
// truncate the string at the first CRLF. Here, we replace with spaces.
|
||||
if (nsIHTMLEditor::eEditorSingleLineMask & mFlags) {
|
||||
// Hack: I stripped out this test for IME inserts - it screws up double byte chars
|
||||
// that happen to end in the same values as CR or LF. Bug 27699
|
||||
if (aInString->IsEmpty() && (aAction != kInsertTextIME))
|
||||
if ((nsIHTMLEditor::eEditorSingleLineMask & mFlags) && (aAction != kInsertTextIME))
|
||||
{
|
||||
aOutString->ReplaceChar(CRLF, ' ');
|
||||
}
|
||||
|
||||
|
||||
@@ -566,7 +566,11 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
|
||||
// fixes bug 21032
|
||||
// *** there's some debate about whether we should replace CRLF with spaces, or
|
||||
// truncate the string at the first CRLF. Here, we replace with spaces.
|
||||
if (nsIHTMLEditor::eEditorSingleLineMask & mFlags) {
|
||||
// Hack: I stripped out this test for IME inserts - it screws up double byte chars
|
||||
// that happen to end in the same values as CR or LF. Bug 27699
|
||||
if (aInString->IsEmpty() && (aAction != kInsertTextIME))
|
||||
if ((nsIHTMLEditor::eEditorSingleLineMask & mFlags) && (aAction != kInsertTextIME))
|
||||
{
|
||||
aOutString->ReplaceChar(CRLF, ' ');
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user