fix for 82813: tweaking editor whitespace handling to behave better when deleting in PRE

r=brade; sr=kin; a=asa
This commit is contained in:
jfrancis%netscape.com 2002-03-21 23:20:57 +00:00
Родитель 31f7cdb7da
Коммит 6f16f7249b
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -1390,7 +1390,7 @@ nsWSRunObject::PrepareToDeleteRangePriv(nsWSRunObject* aEndObject)
NS_ENSURE_SUCCESS(res, res);
}
// adjust normal ws in afterRun if needed
if (afterRun && (afterRun->mType == eNormalWS))
if (afterRun && (afterRun->mType == eNormalWS) && !aEndObject->mPRE)
{
if ( (beforeRun && (beforeRun->mType == eLeadingWS)) ||
(!beforeRun && ((mStartReason & eBlock) || (mStartReason == eBreak))) )
@ -1411,7 +1411,7 @@ nsWSRunObject::PrepareToDeleteRangePriv(nsWSRunObject* aEndObject)
res = DeleteChars(beforeRun->mStartNode, beforeRun->mStartOffset, mNode, mOffset);
NS_ENSURE_SUCCESS(res, res);
}
else if (beforeRun && (beforeRun->mType == eNormalWS))
else if (beforeRun && (beforeRun->mType == eNormalWS) && mPRE)
{
if ( (afterRun && (afterRun->mType == eTrailingWS)) ||
(afterRun && (afterRun->mType == eNormalWS)) ||