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

Fixed nested tables bug 53733. r=brade, a=sfraser

Browse Source
This commit is contained in:
cmanske%netscape.com 2000-09-27 22:24:17 +00:00
parent 13ec38e669
commit 4e41754683
1 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
editor/ui/dialogs/content/EdInsertTable.js
View File

@ -187,6 +187,7 @@ function onOK()
{
if (ValidateData())
{
editorShell.BeginBatchChanges();
editorShell.CloneAttributes(tableElement, globalElement);
// Create necessary rows and cells for the table
@ -215,12 +216,64 @@ function onOK()
}
}
}
// Detect when entire cells are selected:
// Get number of cells selected
var tagNameObj = new Object;
var countObj = new Object;
tagNameObj.value = "";
var element = editorShell.GetSelectedOrParentTableElement(tagNameObj, countObj);
var deletePlaceholder = false;
if (tagNameObj.value == "table")
{
//Replace entire selected table with new table, so delete the table
editorShell.DeleteTable();
}
else if (tagNameObj.value == "td")
{
if (countObj.value >= 1)
{
if (countObj.value > 1)
{
// Assume user wants to replace a block of
// contiguous cells with a tabl, so
// join the selected cells
editorShell.JoinTableCells(false);
// Get the cell everything was merged into
element = editorShell.GetFirstSelectedCell();
// Collapse selection into just that cell
editorShell.editorSelection.collapse(element,0);
}
if (element)
{
// Empty just the contents of the cell
editorShell.DeleteTableCellContents();
// Collapse selection to start of empty cell...
editorShell.editorSelection.collapse(element,0);
// ...but it will contain a <br> placeholder
deletePlaceholder = true;
}
}
}
try {
// Don't delete selected text when inserting
// false means don't delete selected text when inserting
editorShell.InsertElementAtSelection(tableElement, false);
} catch (e) {
dump("Exception occured in InsertElementAtSelection\n");
}
if (deletePlaceholder && tableElement && tableElement.nextSibling)
{
// Delete the placeholder <br>
editorShell.DeleteElement(tableElement.nextSibling);
}
editorShell.EndBatchChanges();
SaveWindowLocation();
return true;
}