Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed removal of empty selection ranges after joining table cells, b=96668, r=akkana, sr=hewitt

Browse Source
This commit is contained in:
cmanske%netscape.com 2001-09-22 18:40:58 +00:00
parent f43182ade5
commit 32e2152071
3 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
editor/base/nsTableEditor.cpp
View File

@ -2319,16 +2319,43 @@ nsHTMLEditor::JoinTableCells(PRBool aMergeNonContiguousContents)
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(elementPtr);
res = DeleteNode(node);
if (NS_FAILED(res)) return res;
// Should we delete this???
//delete elementPtr;
}
}
// Cleanup selection: remove ranges where cells were deleted
nsCOMPtr<nsISelection> selection;
res = GetSelection(getter_AddRefs(selection));
if (NS_FAILED(res)) return res;
if (!selection) return NS_ERROR_FAILURE;
PRInt32 rangeCount;
res = selection->GetRangeCount(&rangeCount);
if (NS_FAILED(res)) return res;
nsCOMPtr<nsIDOMRange> range;
PRInt32 i;
for (i = 0; i < rangeCount; i++)
{
res = selection->GetRangeAt(i, getter_AddRefs(range));
if (NS_FAILED(res)) return res;
if (!range) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMElement> deletedCell;
res = GetCellFromRange(range, getter_AddRefs(deletedCell));
if (!deletedCell)
{
selection->RemoveRange(range);
rangeCount--;
i--;
}
}
// Set spans for the cell everthing merged into
res = SetRowSpan(firstCell, lastRowIndex-firstRowIndex+1);
if (NS_FAILED(res)) return res;
res = SetColSpan(firstCell, lastColIndex-firstColIndex+1);
if (NS_FAILED(res)) return res;
// But check if we merged multiple rows - rowspan shouldn't be > 1
PRInt32 newRowCount;
res = FixBadRowSpan(table, firstRowIndex, newRowCount);
@ -2397,7 +2424,6 @@ nsHTMLEditor::JoinTableCells(PRBool aMergeNonContiguousContents)
res = SetColSpan(targetCell, actualColSpan+actualColSpan2);
if (NS_FAILED(res)) return res;
}
return res;
}

32
editor/libeditor/html/nsTableEditor.cpp
View File

@ -2319,16 +2319,43 @@ nsHTMLEditor::JoinTableCells(PRBool aMergeNonContiguousContents)
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(elementPtr);
res = DeleteNode(node);
if (NS_FAILED(res)) return res;
// Should we delete this???
//delete elementPtr;
}
}
// Cleanup selection: remove ranges where cells were deleted
nsCOMPtr<nsISelection> selection;
res = GetSelection(getter_AddRefs(selection));
if (NS_FAILED(res)) return res;
if (!selection) return NS_ERROR_FAILURE;
PRInt32 rangeCount;
res = selection->GetRangeCount(&rangeCount);
if (NS_FAILED(res)) return res;
nsCOMPtr<nsIDOMRange> range;
PRInt32 i;
for (i = 0; i < rangeCount; i++)
{
res = selection->GetRangeAt(i, getter_AddRefs(range));
if (NS_FAILED(res)) return res;
if (!range) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMElement> deletedCell;
res = GetCellFromRange(range, getter_AddRefs(deletedCell));
if (!deletedCell)
{
selection->RemoveRange(range);
rangeCount--;
i--;
}
}
// Set spans for the cell everthing merged into
res = SetRowSpan(firstCell, lastRowIndex-firstRowIndex+1);
if (NS_FAILED(res)) return res;
res = SetColSpan(firstCell, lastColIndex-firstColIndex+1);
if (NS_FAILED(res)) return res;
// But check if we merged multiple rows - rowspan shouldn't be > 1
PRInt32 newRowCount;
res = FixBadRowSpan(table, firstRowIndex, newRowCount);
@ -2397,7 +2424,6 @@ nsHTMLEditor::JoinTableCells(PRBool aMergeNonContiguousContents)
res = SetColSpan(targetCell, actualColSpan+actualColSpan2);
if (NS_FAILED(res)) return res;
}
return res;
}

2
editor/ui/composer/content/ComposerCommands.js
View File

@ -1587,7 +1587,7 @@ var nsSplitTableCellCommand =
IsSelectionInOneCell() )
{
var colSpan = cell.getAttribute("colspan");
var rowSpan = cell.getAttribute("colspan");
var rowSpan = cell.getAttribute("rowspan");
if (!colSpan) colSpan = 1;
if (!rowSpan) rowSpan = 1;
return (colSpan > 1 || rowSpan > 1 ||