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

fix for 70602: selection not properly reset when joining nodes. {r,sr}={kin,sfraser}

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@88681 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com
2001-03-06 20:16:38 +00:00
parent 6957bbbb7c
commit b9f86f8b98
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/editor/base/nsEditor.cpp
View File

@@ -2830,6 +2830,8 @@ nsEditor::JoinNodesImpl(nsIDOMNode * aNodeToKeep,
// and adjust the selection if needed
// HACK: this is overly simplified - multi-range selections need more work than this
PRBool bNeedToAdjust = PR_FALSE;
// check to see if we joined nodes where selection starts
if (selStartNode.get() == aNodeToJoin)
{
bNeedToAdjust = PR_TRUE;
@@ -2844,12 +2846,8 @@ nsEditor::JoinNodesImpl(nsIDOMNode * aNodeToKeep,
bNeedToAdjust = PR_TRUE;
selStartOffset += firstNodeLength;
}
if (bNeedToAdjust)
selection->Collapse(selStartNode,selStartOffset);
bNeedToAdjust = PR_FALSE;
// check to see if we joined nodes where selection ends
if (selEndNode.get() == aNodeToJoin)
{
bNeedToAdjust = PR_TRUE;
@@ -2865,8 +2863,12 @@ nsEditor::JoinNodesImpl(nsIDOMNode * aNodeToKeep,
selEndOffset += firstNodeLength;
}
// adjust selection if needed
if (bNeedToAdjust)
selection->Extend(selEndNode,selEndOffset);
{
selection->Collapse(selStartNode,selStartOffset);
selection->Extend(selEndNode,selEndOffset);
}
}
}
}