Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 15:55:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed table selection bug 68860. r=brade, sr=sfraser

Browse Source
This commit is contained in:
cmanske%netscape.com 2001-02-16 03:33:12 +00:00
parent a48a60fbdd
commit c7fb9e7600
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/base/src/nsSelection.cpp
View File

@ -1870,7 +1870,13 @@ nsSelection::SetMouseDownState(PRBool aState)
#ifdef DEBUG_TABLE_SELECTION
printf("SetMouseDownState to FALSE - stopping cell selection\n");
#endif
mSelectingTableCells = PR_FALSE;
// Clear the start cell for appending a block
// of cells when last selection action was NOT a cell
if (!mSelectingTableCells)
mAppendStartSelectedCell = nsnull;
else
mSelectingTableCells = PR_FALSE;
mStartSelectedCell = nsnull;
mEndSelectedCell = nsnull;
@ -2421,7 +2427,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
// Select an unselected cell
// but first remove existing selection if not in same table
nsCOMPtr<nsIContent> previousCellContent = do_QueryInterface(previousCellNode);
if (!IsInSameTable(previousCellContent, childContent, nsnull))
if (previousCellContent && !IsInSameTable(previousCellContent, childContent, nsnull))
{
mDomSelections[index]->RemoveAllRanges();
// Reset selection mode that is cleared in RemoveAllRanges
@ -2530,6 +2536,7 @@ printf("HandleTableSelection: Unselecting single selected cell\n");
mSelectingTableCells = PR_FALSE;
mStartSelectedCell = nsnull;
mEndSelectedCell = nsnull;
mAppendStartSelectedCell = nsnull;
mSelectingTableCellMode = 0;
//TODO: We need a "Collapse to just before deepest child" routine
// Even better, should we collapse to just after the LAST deepest child

11
layout/base/src/nsSelection.cpp
View File

@ -1870,7 +1870,13 @@ nsSelection::SetMouseDownState(PRBool aState)
#ifdef DEBUG_TABLE_SELECTION
printf("SetMouseDownState to FALSE - stopping cell selection\n");
#endif
mSelectingTableCells = PR_FALSE;
// Clear the start cell for appending a block
// of cells when last selection action was NOT a cell
if (!mSelectingTableCells)
mAppendStartSelectedCell = nsnull;
else
mSelectingTableCells = PR_FALSE;
mStartSelectedCell = nsnull;
mEndSelectedCell = nsnull;
@ -2421,7 +2427,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
// Select an unselected cell
// but first remove existing selection if not in same table
nsCOMPtr<nsIContent> previousCellContent = do_QueryInterface(previousCellNode);
if (!IsInSameTable(previousCellContent, childContent, nsnull))
if (previousCellContent && !IsInSameTable(previousCellContent, childContent, nsnull))
{
mDomSelections[index]->RemoveAllRanges();
// Reset selection mode that is cleared in RemoveAllRanges
@ -2530,6 +2536,7 @@ printf("HandleTableSelection: Unselecting single selected cell\n");
mSelectingTableCells = PR_FALSE;
mStartSelectedCell = nsnull;
mEndSelectedCell = nsnull;
mAppendStartSelectedCell = nsnull;
mSelectingTableCellMode = 0;
//TODO: We need a "Collapse to just before deepest child" routine
// Even better, should we collapse to just after the LAST deepest child

11
layout/generic/nsSelection.cpp
View File

@ -1870,7 +1870,13 @@ nsSelection::SetMouseDownState(PRBool aState)
#ifdef DEBUG_TABLE_SELECTION
printf("SetMouseDownState to FALSE - stopping cell selection\n");
#endif
mSelectingTableCells = PR_FALSE;
// Clear the start cell for appending a block
// of cells when last selection action was NOT a cell
if (!mSelectingTableCells)
mAppendStartSelectedCell = nsnull;
else
mSelectingTableCells = PR_FALSE;
mStartSelectedCell = nsnull;
mEndSelectedCell = nsnull;
@ -2421,7 +2427,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
// Select an unselected cell
// but first remove existing selection if not in same table
nsCOMPtr<nsIContent> previousCellContent = do_QueryInterface(previousCellNode);
if (!IsInSameTable(previousCellContent, childContent, nsnull))
if (previousCellContent && !IsInSameTable(previousCellContent, childContent, nsnull))
{
mDomSelections[index]->RemoveAllRanges();
// Reset selection mode that is cleared in RemoveAllRanges
@ -2530,6 +2536,7 @@ printf("HandleTableSelection: Unselecting single selected cell\n");
mSelectingTableCells = PR_FALSE;
mStartSelectedCell = nsnull;
mEndSelectedCell = nsnull;
mAppendStartSelectedCell = nsnull;
mSelectingTableCellMode = 0;
//TODO: We need a "Collapse to just before deepest child" routine
// Even better, should we collapse to just after the LAST deepest child