diff --git a/editor/ui/dialogs/content/EdInsertTable.js b/editor/ui/dialogs/content/EdInsertTable.js index 047c5f95e5ac..e2d6e01f8c46 100644 --- a/editor/ui/dialogs/content/EdInsertTable.js +++ b/editor/ui/dialogs/content/EdInsertTable.js @@ -51,10 +51,8 @@ function Startup() dialog.rowsInput = document.getElementById("rowsInput"); dialog.columnsInput = document.getElementById("columnsInput"); dialog.widthInput = document.getElementById("widthInput"); - dialog.heightInput = document.getElementById("heightInput"); dialog.borderInput = document.getElementById("borderInput"); dialog.widthPixelOrPercentMenulist = document.getElementById("widthPixelOrPercentMenulist"); - dialog.heightPixelOrPercentMenulist = document.getElementById("heightPixelOrPercentMenulist"); // Make a copy to use for AdvancedEdit globalElement = tableElement.cloneNode(false); @@ -94,7 +92,6 @@ function InitDialog() // Get the width attribute of the element, stripping out "%" // This sets contents of menu combobox list dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "widthInput","widthPixelOrPercentMenulist", gPercent); - dialog.heightInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "heightInput","heightPixelOrPercentMenulist", gPixel); dialog.borderInput.value = globalElement.getAttribute("border"); } @@ -160,25 +157,6 @@ function ValidateData() globalElement.setAttribute("width", widthText); } - isPercent = (dialog.heightPixelOrPercentMenulist.selectedIndex == 1); - var heightText = TrimString(dialog.heightInput.value); - if (heightText.length > 0) - { - if (isPercent) - maxLimit = 100; - else - // Upper limit when using pixels - maxLimit = maxPixels; - - heightText = ValidateNumberString(heightText, 1, maxLimit); - if (heightText.length == 0) - return false; - - if (isPercent) - heightText += "%"; - - globalElement.setAttribute("height", heightText); - } return true; } diff --git a/editor/ui/dialogs/content/EdInsertTable.xul b/editor/ui/dialogs/content/EdInsertTable.xul index f956d4265f04..db17df471a22 100644 --- a/editor/ui/dialogs/content/EdInsertTable.xul +++ b/editor/ui/dialogs/content/EdInsertTable.xul @@ -68,13 +68,6 @@ - - - - - - diff --git a/editor/ui/dialogs/content/EdTableProps.js b/editor/ui/dialogs/content/EdTableProps.js index a7bca2e8560f..76645494d5d3 100644 --- a/editor/ui/dialogs/content/EdTableProps.js +++ b/editor/ui/dialogs/content/EdTableProps.js @@ -99,8 +99,6 @@ function Startup() // Get dialog widgets - Table Panel dialog.TableRowsInput = document.getElementById("TableRowsInput"); dialog.TableColumnsInput = document.getElementById("TableColumnsInput"); - dialog.TableHeightInput = document.getElementById("TableHeightInput"); - dialog.TableHeightUnits = document.getElementById("TableHeightUnits"); dialog.TableWidthInput = document.getElementById("TableWidthInput"); dialog.TableWidthUnits = document.getElementById("TableWidthUnits"); dialog.BorderWidthInput = document.getElementById("BorderWidthInput"); @@ -259,7 +257,6 @@ function InitDialog() // Get Table attributes dialog.TableRowsInput.value = rowCount; dialog.TableColumnsInput.value = colCount; - dialog.TableHeightInput.value = InitPixelOrPercentMenulist(globalTableElement, TableElement, "height", "TableHeightUnits", gPercent); dialog.TableWidthInput.value = InitPixelOrPercentMenulist(globalTableElement, TableElement, "width", "TableWidthUnits", gPercent); dialog.BorderWidthInput.value = globalTableElement.border; dialog.SpacingInput.value = globalTableElement.cellSpacing; @@ -306,7 +303,7 @@ function InitCellPanel() dialog.CellHeightInput.value = InitPixelOrPercentMenulist(globalCellElement, CellElement, "height", "CellHeightUnits", gPercent); dialog.CellHeightCheckbox.checked = AdvancedEditUsed && previousValue != dialog.CellHeightInput.value; - previousValue= dialog.CellHeightInput.value; + previousValue= dialog.CellWidthInput.value; dialog.CellWidthInput.value = InitPixelOrPercentMenulist(globalCellElement, CellElement, "width", "CellWidthUnits", gPixel); dialog.CellWidthCheckbox.checked = AdvancedEditUsed && previousValue != dialog.CellWidthInput.value; @@ -847,11 +844,6 @@ function ValidateTableData() if (error) return false; - ValidateNumber("TableHeightInput", dialog.TableHeightUnits, - 1, maxPixels, globalTableElement, "height"); - if (error) return false; - - ValidateNumber("TableWidthInput", dialog.TableWidthUnits, 1, maxPixels, globalTableElement, "width"); if (error) return false; @@ -937,7 +929,8 @@ function ValidateCellData() } if (dialog.CellVAlignCheckbox.checked) - SetAlign("CellVAlignList", defVAlign, globalCellElement, "valign"); + SetAlign("CellVAlignList", "", globalCellElement, "valign"); + // SetAlign("CellVAlignList", defVAlign, globalCellElement, "valign"); if (dialog.TextWrapCheckbox.checked) { @@ -1221,7 +1214,6 @@ function ApplyTableAttributes() } } - CloneAttribute(TableElement, globalTableElement, "height"); CloneAttribute(TableElement, globalTableElement, "width"); CloneAttribute(TableElement, globalTableElement, "border"); CloneAttribute(TableElement, globalTableElement, "cellspacing"); diff --git a/editor/ui/dialogs/content/EdTableProps.xul b/editor/ui/dialogs/content/EdTableProps.xul index 934f54d3db4a..c1ce0e8df281 100644 --- a/editor/ui/dialogs/content/EdTableProps.xul +++ b/editor/ui/dialogs/content/EdTableProps.xul @@ -73,11 +73,6 @@ - - - - - diff --git a/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd b/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd index bdbe382b5a8c..8f47a556389e 100644 --- a/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd +++ b/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd @@ -27,8 +27,6 @@ - -