mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Table editing implementation

This commit is contained in:
cmanske%netscape.com 1999-08-04 02:06:03 +00:00
Родитель eb4c379701
Коммит 14bb564bf2
15 изменённых файлов: 839 добавлений и 117 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

308
editor/base/EditTable.cpp
Просмотреть файл

@ -29,88 +29,153 @@
#include "nsIAtom.h"
#include "nsIDOMHTMLTableElement.h"
#include "nsIDOMHTMLTableCellElement.h"
/*
#include "nsIDocument.h"
#include "nsIServiceManager.h"
#include "nsEditFactory.h"
#include "nsTextEditFactory.h"
#include "nsEditorCID.h"
#include "nsTransactionManagerCID.h"
#include "nsITransactionManager.h"
#include "nsIPresShell.h"
#include "nsIViewManager.h"
#include "nsICollection.h"
#include "nsIEnumerator.h"
#include "nsVoidArray.h"
#include "nsICaret.h"
*/
#include "nsITableCellLayout.h" // For efficient access to table cell
#include "nsITableLayout.h" // data owned by the table and cell frames
// transactions the editor knows how to build
#include "TransactionFactory.h"
#include "EditAggregateTxn.h"
#include "nsIDOMHTMLCollection.h"
//#include "TransactionFactory.h"
//#include "EditAggregateTxn.h"
//#include "nsIDOMHTMLCollection.h"
#include "nsHTMLEditor.h"
static NS_DEFINE_IID(kITransactionManagerIID, NS_ITRANSACTIONMANAGER_IID);
// Table Editing methods
NS_IMETHODIMP
nsHTMLEditor::InsertTable()
{
nsresult result=NS_ERROR_NOT_INITIALIZED;
nsresult res=NS_ERROR_NOT_INITIALIZED;
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsHTMLEditor::InsertTableCell(PRInt32 aNumber, PRBool aAfter)
{
return NS_ERROR_NOT_IMPLEMENTED;
nsCOMPtr<nsIDOMSelection> selection;
nsCOMPtr<nsIDOMElement> table;
nsCOMPtr<nsIDOMElement> cell;
nsCOMPtr<nsIDOMNode> cellParent;
PRInt32 cellOffset, startRow, startCol;
nsresult res = GetCellContext(selection, table, cell, cellParent, cellOffset, startRow, startCol);
if (NS_SUCCEEDED(res))
{
PRInt32 i;
for (i = 0; i < aNumber; i++)
{
nsCOMPtr<nsIDOMElement> newCell;
res = CreateElementWithDefaults("td", getter_AddRefs(newCell));
if (NS_SUCCEEDED(res) && newCell)
{
if (aAfter) cellOffset++;
res = InsertNode(newCell, cellParent, cellOffset);
}
}
SetCaretAfterTableEdit(table, startRow, startCol, ePreviousColumn);
}
return res;
}
NS_IMETHODIMP
nsHTMLEditor::InsertTableColumn(PRInt32 aNumber, PRBool aAfter)
{
return NS_ERROR_NOT_IMPLEMENTED;
nsCOMPtr<nsIDOMSelection> selection;
nsCOMPtr<nsIDOMElement> table;
nsCOMPtr<nsIDOMElement> cell;
nsCOMPtr<nsIDOMNode> cellParent;
PRInt32 cellOffset, startRow, startCol;
nsresult res = GetCellContext(selection, table, cell, cellParent, cellOffset, startRow, startCol);
if (NS_SUCCEEDED(res))
{
PRInt32 rowCount, colCount, row, col, curRow, curCol;
if (NS_FAILED(GetTableSize(table, rowCount, colCount)))
return NS_ERROR_FAILURE;
for ( row = 0; row < rowCount; row++)
{
nsCOMPtr<nsIDOMElement> curCell;
PRInt32 startRow, startCol, rowSpan, colSpan;
PRBool isSelected;
res = GetCellDataAt(table, row, col, *getter_AddRefs(curCell),
startRow, startCol, rowSpan, colSpan, isSelected);
if (NS_SUCCEEDED(res) && curCell)
{
//FINISH ME!
}
}
}
return res;
}
NS_IMETHODIMP
nsHTMLEditor::InsertTableRow(PRInt32 aNumber, PRBool aAfter)
{
nsCOMPtr<nsIDOMSelection>selection;
nsresult res = nsEditor::GetSelection(getter_AddRefs(selection));
if (NS_FAILED(res) || !selection)
return res;
// Collapse the current selection
selection->ClearSelection();
nsCOMPtr<nsIDOMNode> anchorNode;
res = selection->GetAnchorNode(getter_AddRefs(anchorNode));
if (NS_FAILED(res) || !anchorNode)
return res;
nsCOMPtr<nsIDOMElement> cell;
nsCOMPtr<nsIDOMElement> row;
nsCOMPtr<nsIDOMSelection> selection;
nsCOMPtr<nsIDOMElement> table;
res = NS_ERROR_FAILURE;
//if(NS_SUCCEEDED(GetElementOrParentByTagName("td", anchorNode, getter_AddRefs(cell))
nsCOMPtr<nsIDOMElement> cell;
nsCOMPtr<nsIDOMNode> cellParent;
PRInt32 cellOffset, startRow, startCol;
nsresult res = GetCellContext(selection, table, cell, cellParent, cellOffset, startRow, startCol);
if (NS_SUCCEEDED(res))
{
selection->ClearSelection();
}
return res;
}
NS_IMETHODIMP
nsHTMLEditor::DeleteTable()
{
return NS_ERROR_NOT_IMPLEMENTED;
nsCOMPtr<nsIDOMSelection> selection;
nsCOMPtr<nsIDOMElement> table;
nsCOMPtr<nsIDOMElement> cell;
nsCOMPtr<nsIDOMNode> cellParent;
PRInt32 cellOffset, startRow, startCol;
nsresult res = GetCellContext(selection, table, cell, cellParent, cellOffset, startRow, startCol);
if (NS_SUCCEEDED(res))
{
// Save where we need to restore the selection
nsCOMPtr<nsIDOMNode> tableParent;
PRInt32 tableOffset;
if(NS_FAILED(table->GetParentNode(getter_AddRefs(tableParent))) || !tableParent)
return NS_ERROR_FAILURE;
res = DeleteNode(table);
// Restore the selection (caret)
nsCOMPtr<nsIDOMSelection>selection;
res = nsEditor::GetSelection(getter_AddRefs(selection));
if (NS_FAILED(res) || !selection)
return res;
selection->Collapse(tableParent, tableOffset);
}
return res;
}
NS_IMETHODIMP
nsHTMLEditor::DeleteTableCell(PRInt32 aNumber)
{
return NS_ERROR_NOT_IMPLEMENTED;
nsCOMPtr<nsIDOMSelection> selection;
nsCOMPtr<nsIDOMElement> table;
nsCOMPtr<nsIDOMElement> cell;
nsCOMPtr<nsIDOMNode> cellParent;
PRInt32 cellOffset, startRow, startCol;
nsresult res = GetCellContext(selection, table, cell, cellParent, cellOffset, startRow, startCol);
if (NS_SUCCEEDED(res))
{
selection->ClearSelection();
PRInt32 i;
for (i = 0; i < aNumber; i++)
{
//TODO: FINISH ME!
if (NS_FAILED(DeleteNode(cell)))
break;
}
SetCaretAfterTableEdit(table, startRow, startCol, ePreviousColumn);
}
return res;
}
NS_IMETHODIMP
@ -126,7 +191,13 @@ nsHTMLEditor::DeleteTableRow(PRInt32 aNumber)
}
NS_IMETHODIMP
nsHTMLEditor::JoinTableCells(PRBool aCellToRight)
nsHTMLEditor::JoinTableCells()
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsHTMLEditor::NormalizeTable(nsIDOMElement *aTable)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -134,31 +205,36 @@ nsHTMLEditor::JoinTableCells(PRBool aCellToRight)
NS_IMETHODIMP
nsHTMLEditor::GetCellIndexes(nsIDOMElement *aCell, PRInt32 &aColIndex, PRInt32 &aRowIndex)
{
nsresult result=NS_ERROR_NOT_INITIALIZED;
nsresult res=NS_ERROR_NOT_INITIALIZED;
aColIndex=0; // initialize out params
aRowIndex=0;
if (!aCell)
return result;
{
// Get the selected cell or the cell enclosing the selection anchor
nsCOMPtr<nsIDOMElement> cell;
res = GetElementOrParentByTagName("td", nsnull, getter_AddRefs(cell));
if (NS_SUCCEEDED(res) && cell)
aCell = cell;
else
return NS_ERROR_FAILURE;
}
result = NS_ERROR_FAILURE; // we return an error unless we get the index
res = NS_ERROR_FAILURE; // we return an error unless we get the index
nsISupports *layoutObject=nsnull; // frames are not ref counted, so don't use an nsCOMPtr
result = nsEditor::GetLayoutObject(aCell, &layoutObject);
res = nsEditor::GetLayoutObject(aCell, &layoutObject);
if ((NS_SUCCEEDED(result)) && (nsnull!=layoutObject))
if ((NS_SUCCEEDED(res)) && (nsnull!=layoutObject))
{ // get the table cell interface from the frame
nsITableCellLayout *cellLayoutObject=nsnull; // again, frames are not ref-counted
result = layoutObject->QueryInterface(nsITableCellLayout::GetIID(), (void**)(&cellLayoutObject));
if ((NS_SUCCEEDED(result)) && (nsnull!=cellLayoutObject))
{ // get the index
result = cellLayoutObject->GetColIndex(aColIndex);
if (NS_SUCCEEDED(result))
{
result = cellLayoutObject->GetRowIndex(aRowIndex);
}
res = layoutObject->QueryInterface(nsITableCellLayout::GetIID(), (void**)(&cellLayoutObject));
if ((NS_SUCCEEDED(res)) && (nsnull!=cellLayoutObject))
{
res = cellLayoutObject->GetCellIndexes(aRowIndex, aColIndex);
}
}
return result;
return res;
}
NS_IMETHODIMP
@ -170,33 +246,42 @@ nsHTMLEditor::GetTableLayoutObject(nsIDOMElement* aTable, nsITableLayout **table
// frames are not ref counted, so don't use an nsCOMPtr
nsISupports *layoutObject=nsnull;
nsresult result = nsEditor::GetLayoutObject(aTable, &layoutObject);
if ((NS_SUCCEEDED(result)) && (nsnull!=layoutObject))
nsresult res = nsEditor::GetLayoutObject(aTable, &layoutObject);
if ((NS_SUCCEEDED(res)) && (nsnull!=layoutObject))
{ // get the table interface from the frame
result = layoutObject->QueryInterface(nsITableLayout::GetIID(),
res = layoutObject->QueryInterface(nsITableLayout::GetIID(),
(void**)(tableLayoutObject));
}
return result;
return res;
}
/* Not scriptable: For convenience in C++ */
NS_IMETHODIMP
nsHTMLEditor::GetTableSize(nsIDOMElement *aTable, PRInt32& aRowCount, PRInt32& aColCount)
{
nsresult res=NS_ERROR_FAILURE;
aRowCount = 0;
aColCount = 0;
if (!aTable)
return NS_ERROR_NOT_INITIALIZED;
{
// Get the selected talbe or the table enclosing the selection anchor
nsCOMPtr<nsIDOMElement> table;
res = GetElementOrParentByTagName("table", nsnull, getter_AddRefs(table));
if (NS_SUCCEEDED(res) && table)
aTable = table;
else
return NS_ERROR_FAILURE;
}
// frames are not ref counted, so don't use an nsCOMPtr
nsITableLayout *tableLayoutObject;
nsresult result = GetTableLayoutObject(aTable, &tableLayoutObject);
if ((NS_SUCCEEDED(result)) && (nsnull!=tableLayoutObject))
res = GetTableLayoutObject(aTable, &tableLayoutObject);
if ((NS_SUCCEEDED(res)) && (nsnull!=tableLayoutObject))
{
result = tableLayoutObject->GetTableSize(aRowCount, aColCount);
res = tableLayoutObject->GetTableSize(aRowCount, aColCount);
}
return result;
return res;
}
NS_IMETHODIMP
@ -204,6 +289,7 @@ nsHTMLEditor::GetCellDataAt(nsIDOMElement* aTable, PRInt32 aRowIndex, PRInt32 aC
PRInt32& aStartRowIndex, PRInt32& aStartColIndex,
PRInt32& aRowSpan, PRInt32& aColSpan, PRBool& aIsSelected)
{
nsresult res=NS_ERROR_FAILURE;
aCell = nsnull;
aStartRowIndex = 0;
aStartColIndex = 0;
@ -212,20 +298,28 @@ nsHTMLEditor::GetCellDataAt(nsIDOMElement* aTable, PRInt32 aRowIndex, PRInt32 aC
aIsSelected = PR_FALSE;
if (!aTable)
return NS_ERROR_NOT_INITIALIZED;
{
// Get the selected talbe or the table enclosing the selection anchor
nsCOMPtr<nsIDOMElement> table;
res = GetElementOrParentByTagName("table", nsnull, getter_AddRefs(table));
if (NS_SUCCEEDED(res) && table)
aTable = table;
else
return NS_ERROR_FAILURE;
}
// frames are not ref counted, so don't use an nsCOMPtr
nsITableLayout *tableLayoutObject;
nsresult result = GetTableLayoutObject(aTable, &tableLayoutObject);
if ((NS_SUCCEEDED(result)) && (nsnull!=tableLayoutObject))
res = GetTableLayoutObject(aTable, &tableLayoutObject);
if ((NS_SUCCEEDED(res)) && (nsnull!=tableLayoutObject))
{
// Note that this returns NS_TABLELAYOUT_CELL_NOT_FOUND when
// the index(es) are out of bounds
result = tableLayoutObject->GetCellDataAt(aRowIndex, aColIndex, aCell,
res = tableLayoutObject->GetCellDataAt(aRowIndex, aColIndex, aCell,
aStartRowIndex, aStartColIndex,
aRowSpan, aColSpan, aIsSelected);
}
return result;
return res;
}
// When all you want is the cell
@ -238,3 +332,73 @@ nsHTMLEditor::GetCellAt(nsIDOMElement* aTable, PRInt32 aRowIndex, PRInt32 aColIn
aStartRowIndex, aStartColIndex, aRowSpan, aColSpan, aIsSelected);
}
NS_IMETHODIMP
nsHTMLEditor::GetCellContext(nsCOMPtr<nsIDOMSelection> &aSelection,
nsCOMPtr<nsIDOMElement> &aTable, nsCOMPtr<nsIDOMElement> &aCell,
nsCOMPtr<nsIDOMNode> &aCellParent, PRInt32& aCellOffset,
PRInt32& aRow, PRInt32& aCol)
{
nsresult res = nsEditor::GetSelection(getter_AddRefs(aSelection));
if (NS_FAILED(res) || !aSelection)
return res;
// TODO: Should we look for the "first" cell instead?
// Messy! We would need to iterate through the selection to find the first enclosing cell
nsCOMPtr<nsIDOMNode> anchorNode;
if(NS_FAILED(aSelection->GetAnchorNode(getter_AddRefs(anchorNode))) || !anchorNode)
return NS_ERROR_FAILURE;
// Test if anchor is a cell node (should I bother to check header as well?
nsCOMPtr<nsIDOMHTMLTableCellElement> cellElement = do_QueryInterface(anchorNode);
if (cellElement)
{
aCell = do_QueryInterface(anchorNode);
} else {
// Get the anchor's first child, in case the selection is composed of cells
PRInt32 offset;
if (NS_FAILED(aSelection->GetAnchorOffset(&offset)))
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> anchorChild = GetChildAt(anchorNode, offset);
if(!anchorChild)
return NS_ERROR_FAILURE;
// Get the cell enclosing the selection anchor
if(NS_FAILED(GetElementOrParentByTagName("td", anchorChild, getter_AddRefs(aCell))) || !aCell)
return NS_ERROR_FAILURE;
}
if(NS_FAILED(GetElementOrParentByTagName("table", aCell, getter_AddRefs(aTable))) || !aTable)
return NS_ERROR_FAILURE;
if(NS_FAILED(aCell->GetParentNode(getter_AddRefs(aCellParent))) || !aCellParent)
return NS_ERROR_FAILURE;
// Get current cell location so we can put caret back there when done
res = GetCellIndexes(aCell, aRow, aCol);
if(NS_FAILED(res))
return res;
return GetChildOffset(aCell, aCellParent, aCellOffset);
}
NS_IMETHODIMP
nsHTMLEditor::SetCaretAfterTableEdit(nsIDOMElement* aTable, PRInt32 aCol, PRInt32 aRow, SetCaretSearchDirection aDirection)
{
nsresult res = NS_ERROR_NOT_INITIALIZED;
if (!aTable)
return res;
nsCOMPtr<nsIDOMSelection>selection;
res = nsEditor::GetSelection(getter_AddRefs(selection));
if (!NS_SUCCEEDED(res) || !selection)
{
#ifdef DEBUG_cmanske
printf("Selection not found after table manipulation!\n");
#endif
return NS_ERROR_FAILURE;
}
return res;
}

174
editor/base/nsEditorShell.cpp
Просмотреть файл

@ -2122,6 +2122,179 @@ nsEditorShell::SetSelectionAfterElement(nsIDOMElement* aElement)
/* Table Editing */
NS_IMETHODIMP
nsEditorShell::InsertTableCell(PRInt32 aNumber, PRBool bAfter)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->InsertTableCell(aNumber, bAfter);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::InsertTableRow(PRInt32 aNumber, PRBool bAfter)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->InsertTableRow(aNumber,bAfter);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::InsertTableColumn(PRInt32 aNumber, PRBool bAfter)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->InsertTableColumn(aNumber,bAfter);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTable()
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTable();
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTableCell(PRInt32 aNumber)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTableCell(aNumber);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTableRow(PRInt32 aNumber)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTableRow(aNumber);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTableColumn(PRInt32 aNumber)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTableColumn(aNumber);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::JoinTableCells()
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->JoinTableCells();
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::NormalizeTable(nsIDOMElement *aTable)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->NormalizeTable(aTable);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
// The next four methods are factored to return single items
// separately for row and column.
// Underlying implementation gets both at the same time for efficiency.
@ -2149,7 +2322,6 @@ nsEditorShell::GetRowIndex(nsIDOMElement *cellElement, PRInt32 *_retval)
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}

15
editor/base/nsEditorShell.h
Просмотреть файл

@ -149,6 +149,21 @@ class nsEditorShell : public nsIEditorShell,
NS_IMETHOD SelectElement(nsIDOMElement *element);
NS_IMETHOD SetSelectionAfterElement(nsIDOMElement *element);
/* Table insert and delete methods. Done relative to selected cell or
cell containing the selection anchor */
NS_IMETHOD InsertTableCell(PRInt32 aNumber, PRBool bAfter);
NS_IMETHOD InsertTableRow(PRInt32 aNumber, PRBool bAfter);
NS_IMETHOD InsertTableColumn(PRInt32 aNumber, PRBool bAfter);
NS_IMETHOD DeleteTable();
NS_IMETHOD DeleteTableCell(PRInt32 aNumber);
NS_IMETHOD DeleteTableRow(PRInt32 aNumber);
NS_IMETHOD DeleteTableColumn(PRInt32 aNumber);
NS_IMETHOD JoinTableCells();
/** Make table "rectangular" -- fill in all missing cellmap locations
* If aTable is null, it uses table enclosing the selection anchor
*/
NS_IMETHOD NormalizeTable(nsIDOMElement *aTable);
/* Get the row and col indexes in layout's cellmap */
NS_IMETHOD GetRowIndex(nsIDOMElement *aCell, PRInt32 *_retval);
NS_IMETHOD GetColumnIndex(nsIDOMElement *aCell, PRInt32 *_retval);

21
editor/base/nsHTMLEditor.h
Просмотреть файл

@ -177,6 +177,7 @@ public:
PRInt32& aStartRowIndex, PRInt32& aStartColIndex,
PRInt32& aRowSpan, PRInt32& aColSpan, PRBool& aIsSelected);
NS_IMETHOD InsertTable();
NS_IMETHOD InsertTableCell(PRInt32 aNumber, PRBool aAfter);
NS_IMETHOD InsertTableColumn(PRInt32 aNumber, PRBool aAfter);
@ -185,7 +186,25 @@ public:
NS_IMETHOD DeleteTableCell(PRInt32 aNumber);
NS_IMETHOD DeleteTableColumn(PRInt32 aNumber);
NS_IMETHOD DeleteTableRow(PRInt32 aNumber);
NS_IMETHOD JoinTableCells(PRBool aCellToRight);
NS_IMETHOD JoinTableCells();
/** Make table "rectangular" -- fill in all missing cellmap locations
* If aTable is null, it uses table enclosing the selection anchor
*/
NS_IMETHOD NormalizeTable(nsIDOMElement *aTable);
// Table utilities
// All of the above need to get the same basic context data
NS_IMETHOD GetCellContext(nsCOMPtr<nsIDOMSelection> &aSelection,
nsCOMPtr<nsIDOMElement> &aTable, nsCOMPtr<nsIDOMElement> &aCell,
nsCOMPtr<nsIDOMNode> &aCellParent, PRInt32& aCellOffset,
PRInt32& aRow, PRInt32& aCol);
// Setting caret to a logical place can get tricky,
// especially after deleting table stuff
typedef enum { ePreviousColumn=0, ePreviousRow } SetCaretSearchDirection;
NS_IMETHOD SetCaretAfterTableEdit(nsIDOMElement* aTable, PRInt32 aCol, PRInt32 aRow, SetCaretSearchDirection aDirection);
protected:

2
editor/base/nsJSEditorLog.cpp
Просмотреть файл

@ -773,7 +773,7 @@ nsJSEditorLog::DeleteTableRow(PRInt32 aNumber)
}
NS_IMETHODIMP
nsJSEditorLog::JoinTableCells(PRBool aCellToRight)
nsJSEditorLog::JoinTableCells()
{
return NS_ERROR_NOT_IMPLEMENTED;
}

2
editor/base/nsJSEditorLog.h
Просмотреть файл

@ -141,7 +141,7 @@ public:
NS_IMETHOD DeleteTableCell(PRInt32 aNumber);
NS_IMETHOD DeleteTableColumn(PRInt32 aNumber);
NS_IMETHOD DeleteTableRow(PRInt32 aNumber);
NS_IMETHOD JoinTableCells(PRBool aCellToRight);
NS_IMETHOD JoinTableCells();
NS_IMETHOD BeginComposition(void);
NS_IMETHOD SetCompositionString(const nsString& aCompositionString, nsIDOMTextRangeList* aTextRangeList);
NS_IMETHOD EndComposition(void);

174
editor/composer/src/nsEditorShell.cpp
Просмотреть файл

@ -2122,6 +2122,179 @@ nsEditorShell::SetSelectionAfterElement(nsIDOMElement* aElement)
/* Table Editing */
NS_IMETHODIMP
nsEditorShell::InsertTableCell(PRInt32 aNumber, PRBool bAfter)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->InsertTableCell(aNumber, bAfter);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::InsertTableRow(PRInt32 aNumber, PRBool bAfter)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->InsertTableRow(aNumber,bAfter);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::InsertTableColumn(PRInt32 aNumber, PRBool bAfter)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->InsertTableColumn(aNumber,bAfter);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTable()
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTable();
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTableCell(PRInt32 aNumber)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTableCell(aNumber);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTableRow(PRInt32 aNumber)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTableRow(aNumber);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteTableColumn(PRInt32 aNumber)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->DeleteTableColumn(aNumber);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::JoinTableCells()
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->JoinTableCells();
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
NS_IMETHODIMP
nsEditorShell::NormalizeTable(nsIDOMElement *aTable)
{
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{
case eHTMLTextEditorType:
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
if (htmlEditor)
result = htmlEditor->NormalizeTable(aTable);
}
break;
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}
// The next four methods are factored to return single items
// separately for row and column.
// Underlying implementation gets both at the same time for efficiency.
@ -2149,7 +2322,6 @@ nsEditorShell::GetRowIndex(nsIDOMElement *cellElement, PRInt32 *_retval)
default:
result = NS_ERROR_NOT_IMPLEMENTED;
}
return result;
}

15
editor/composer/src/nsEditorShell.h
Просмотреть файл

@ -149,6 +149,21 @@ class nsEditorShell : public nsIEditorShell,
NS_IMETHOD SelectElement(nsIDOMElement *element);
NS_IMETHOD SetSelectionAfterElement(nsIDOMElement *element);
/* Table insert and delete methods. Done relative to selected cell or
cell containing the selection anchor */
NS_IMETHOD InsertTableCell(PRInt32 aNumber, PRBool bAfter);
NS_IMETHOD InsertTableRow(PRInt32 aNumber, PRBool bAfter);
NS_IMETHOD InsertTableColumn(PRInt32 aNumber, PRBool bAfter);
NS_IMETHOD DeleteTable();
NS_IMETHOD DeleteTableCell(PRInt32 aNumber);
NS_IMETHOD DeleteTableRow(PRInt32 aNumber);
NS_IMETHOD DeleteTableColumn(PRInt32 aNumber);
NS_IMETHOD JoinTableCells();
/** Make table "rectangular" -- fill in all missing cellmap locations
* If aTable is null, it uses table enclosing the selection anchor
*/
NS_IMETHOD NormalizeTable(nsIDOMElement *aTable);
/* Get the row and col indexes in layout's cellmap */
NS_IMETHOD GetRowIndex(nsIDOMElement *aCell, PRInt32 *_retval);
NS_IMETHOD GetColumnIndex(nsIDOMElement *aCell, PRInt32 *_retval);

19
editor/idl/nsIEditorShell.idl
Просмотреть файл

@ -122,6 +122,25 @@ interface nsIEditorShell : nsISupports
void SetSelectionAfterElement(in nsIDOMElement element);
/***** Table editing *****/
/* These are done relative to selected cell
or cell contain the selection anchor */
void InsertTableCell(in PRInt32 number, in PRBool after);
void InsertTableRow(in PRInt32 number, in PRBool after);
void InsertTableColumn(in PRInt32 number, in PRBool after);
void DeleteTable();
void DeleteTableCell(in PRInt32 number);
void DeleteTableRow(in PRInt32 number);
void DeleteTableColumn(in PRInt32 number);
void JoinTableCells();
/** Scan through all rows and add cells as needed so
* all locations in the cellmap are occupied.
* Used after inserting single cells or pasting
* a collection of cells that extend past the
* previous size of the table
* If aTable is null, it uses table enclosing the selection anchor
*/
void NormalizeTable(in nsIDOMElement tableElement);
/* Get the indexes from layout's cellmap */
PRInt32 GetRowIndex(in nsIDOMElement cellElement);

21
editor/libeditor/html/nsHTMLEditor.h
Просмотреть файл

@ -177,6 +177,7 @@ public:
PRInt32& aStartRowIndex, PRInt32& aStartColIndex,
PRInt32& aRowSpan, PRInt32& aColSpan, PRBool& aIsSelected);
NS_IMETHOD InsertTable();
NS_IMETHOD InsertTableCell(PRInt32 aNumber, PRBool aAfter);
NS_IMETHOD InsertTableColumn(PRInt32 aNumber, PRBool aAfter);
@ -185,7 +186,25 @@ public:
NS_IMETHOD DeleteTableCell(PRInt32 aNumber);
NS_IMETHOD DeleteTableColumn(PRInt32 aNumber);
NS_IMETHOD DeleteTableRow(PRInt32 aNumber);
NS_IMETHOD JoinTableCells(PRBool aCellToRight);
NS_IMETHOD JoinTableCells();
/** Make table "rectangular" -- fill in all missing cellmap locations
* If aTable is null, it uses table enclosing the selection anchor
*/
NS_IMETHOD NormalizeTable(nsIDOMElement *aTable);
// Table utilities
// All of the above need to get the same basic context data
NS_IMETHOD GetCellContext(nsCOMPtr<nsIDOMSelection> &aSelection,
nsCOMPtr<nsIDOMElement> &aTable, nsCOMPtr<nsIDOMElement> &aCell,
nsCOMPtr<nsIDOMNode> &aCellParent, PRInt32& aCellOffset,
PRInt32& aRow, PRInt32& aCol);
// Setting caret to a logical place can get tricky,
// especially after deleting table stuff
typedef enum { ePreviousColumn=0, ePreviousRow } SetCaretSearchDirection;
NS_IMETHOD SetCaretAfterTableEdit(nsIDOMElement* aTable, PRInt32 aCol, PRInt32 aRow, SetCaretSearchDirection aDirection);
protected:

41
editor/public/nsIHTMLEditor.h
Просмотреть файл

@ -264,17 +264,53 @@ public:
NS_IMETHOD GetEmbeddedObjects(nsISupportsArray** aNodeList)=0;
// Table editing Methods
/** Not implemented yet
/** Insert table methods
* Insert relative to the selected cell or the
* cell enclosing the selection anchor
* The selection is collapsed and is left in the new cell
* at the same row,col location as the original anchor cell
*
* @param aNumber Number of items to insert
* @param aAfter If TRUE, insert after the current cell,
* else insert before current cell
*/
NS_IMETHOD InsertTable()=0;
NS_IMETHOD InsertTableCell(PRInt32 aNumber, PRBool aAfter)=0;
NS_IMETHOD InsertTableColumn(PRInt32 aNumber, PRBool aAfter)=0;
NS_IMETHOD InsertTableRow(PRInt32 aNumber, PRBool aAfter)=0;
/** Delete table methods
* Delete starting at the selected cell or the
* cell (or table) enclosing the selection anchor
* The selection is collapsed and is left in the
* cell at the same row,col location as
* the previous selection anchor, if possible,
* else in the closest neigboring cell
*
* @param aNumber Number of items to insert/delete
*/
NS_IMETHOD DeleteTable()=0;
NS_IMETHOD DeleteTableCell(PRInt32 aNumber)=0;
NS_IMETHOD DeleteTableColumn(PRInt32 aNumber)=0;
NS_IMETHOD DeleteTableRow(PRInt32 aNumber)=0;
NS_IMETHOD JoinTableCells(PRBool aCellToRight)=0;
/** Join the contents of the selected cells into one cell,
* expanding that cells ROWSPAN and COLSPAN to take up
* the same number of cellmap locations as before.
* Cells whose contents were moved are deleted.
* If there's one cell selected or caret is in one cell,
* it is joined with the cell to the right, if it exists
*/
NS_IMETHOD JoinTableCells()=0;
/** Scan through all rows and add cells as needed so
* all locations in the cellmap are occupied.
* Used after inserting single cells or pasting
* a collection of cells that extend past the
* previous size of the table
* If aTable is null, it uses table enclosing the selection anchor
*/
NS_IMETHOD NormalizeTable(nsIDOMElement *aTable)=0;
/** Get the row an column index from the layout's cellmap
* If aTable is null, it will try to find enclosing table of selection ancho
@ -324,6 +360,7 @@ public:
PRInt32& aStartRowIndex, PRInt32& aStartColIndex,
PRInt32& aRowSpan, PRInt32& aColSpan, PRBool& aIsSelected)=0;
// IME editing Methods
NS_IMETHOD BeginComposition(void)=0;
NS_IMETHOD SetCompositionString(const nsString& aCompositionString, nsIDOMTextRangeList* aTextRangeList)=0;

43
editor/ui/composer/content/EditorAppShell.xul
Просмотреть файл

@ -178,6 +178,18 @@
<!ENTITY stylesheetChocolateCmd.label "Chocolate">
<!ENTITY stylesheetSteelyCmd.label "Steely">
<!ENTITY tableMenu.label "Table">
<!ENTITY tableInsertMenu.label "Insert">
<!ENTITY tableTable.label "Table">
<!ENTITY tableRow.label "Row">
<!ENTITY tableColumn.label "Column">
<!ENTITY tableCell.label "Cell">
<!ENTITY tableCellBefore.label "Cell before">
<!ENTITY tableCellAfter.label "Cell after">
<!ENTITY tableDeleteMenu.label "Delete">
<!ENTITY tableJoinCells.label "Join Cells">
<!ENTITY properties.label "Properties...">
<!ENTITY toolsMenu.label "Tools">
<!ENTITY newBrowserCmd.label "New Browser Window">
<!ENTITY newPlaintextEditorCmd.label "New Plaintext Editor">
@ -531,9 +543,34 @@
</menupopup>
</menu>
<menu value="&toolsMenu.label;">
<!-- PUT THESE SUBMENUS IN AN OVERLAY FOR RESUSE IN CONTEXT MENUS -->
<menu value="&tableMenu.label;">
<menupopup>
<menuitem value="&newBrowserCmd.label;" onaction="EditorNewBrowser()"/>
<menu value="&tableInsertMenu.label;">
<menupopup>
<menuitem value="&tableTable.label;" onaction="EditorInsertTable()"/>
<menuitem value="&tableRow.label;" onaction="EditorInsertTableRow()"/>
<menuitem value="&tableColumn.label;" onaction="EditorInsertTableColumn()"/>
<menuitem value="&tableCell.label;" onaction="EditorInsertTableCell(false)"/>
</menupopup>
</menu>
<menu value="&tableDeleteMenu.label;">
<menupopup>
<menuitem value="&tableTable.label;" onaction="EditorDeleteTable()"/>
<menuitem value="&tableRow.label;" onaction="EditorDeleteTableRow()"/>
<menuitem value="&tableColumn.label;" onaction="EditorDeleteTableColumn()"/>
<menuitem value="&tableCell.label;" onaction="EditorDeleteTableCell()"/>
</menupopup>
</menu>
<menuseparator />
<menuitem value="&tableJoinCells.label;" onaction="EditorJoinTableCells()"/>
<menuitem value="&properties.label;" onaction="EditorInsertOrEditTable(false)"/>
</menupopup>
</menu>
<menu value="&toolsMenu.label;">
<menupopup>
<menuitem value="&newBrowserCmd.label;" onaction="EditorNewBrowser()"/>
<menuitem value="&newPlaintextEditorCmd.label;" onaction="EditorNewPlaintext()"/>
<menuseparator />
<menuitem value="&checkSpellingCmd.label;" onaction="CheckSpelling()"/>
@ -583,7 +620,7 @@
<titledbutton src="&imageIcon.url;" value="&imageToolbarCmd.label;" onclick="EditorInsertImage()"/>
<titledbutton src="&targetIcon.url;" value="&anchorToolbarCmd.label;" onclick="EditorInsertNamedAnchor()"/>
<titledbutton src="&hlineIcon.url;" value="&hruleToolbarCmd.label;" onclick="EditorInsertHLine()"/>
<titledbutton src="&tableIcon.url;" value="&tableToolbarCmd.label;" onclick="EditorInsertTable()"/>
<titledbutton src="&tableIcon.url;" value="&tableToolbarCmd.label;" onclick="EditorInsertOrEditTable(true)"/>
<titledbutton src="&spellingIcon.url;" value="&spellToolbarCmd.label;" onclick="CheckSpelling()"/>
<spring flex="100%"/>
<titledbutton id="DisplayStyleButton" src="&previewIcon.url;" value="&previewToolbarCmd.label;" class="popup" onclick="EditorToggleDisplayStyle()"/>

110
editor/ui/composer/content/EditorCommands.js
Просмотреть файл

@ -25,11 +25,11 @@ var EditorDisplayStyle = true;
var gTagToFormat = {
"P" : "Normal", // these should really be entities. Not sure how to do that from JS
"H1" : "Heading 1",
"H2" : "Header 2",
"H3" : "Header 3",
"H4" : "Header 4",
"H5" : "Header 5",
"H6" : "Header 6",
"H2" : "Heading 2",
"H3" : "Heading 3",
"H4" : "Heading 4",
"H5" : "Heading 5",
"H6" : "Heading 6",
"BLOCKQUOTE" : "Blockquote",
"ADDRESS" : "Address",
"PRE" : "Preformatted",
@ -442,30 +442,6 @@ function EditorInsertImage()
contentWindow.focus();
}
function EditorInsertOrEditTable()
{
var selection = editorShell.editorSelection;
dump("Selection: Anchor: "+selection.anchorNode+selection.anchorOffset+" Focus: "+selection.focusNode+selection.focusOffset+"\n");
var table = editorShell.GetElementOrParentByTagName("table", null);
if (table) {
// Edit properties of existing table
dump("Existing table found ... Editing its properties\n");
window.openDialog("chrome://editor/content/EdTableProps.xul", "TableDlg", "chrome", "");
contentWindow.focus();
} else {
EditorInsertTable();
}
}
function EditorInsertTable()
{
// Insert a new table
window.openDialog("chrome://editor/content/EdInsertTable.xul", "TableDlg", "chrome", "");
contentWindow.focus();
}
function EditorInsertHLine()
{
// Inserting an HLine is different in that we don't use properties dialog
@ -500,6 +476,82 @@ function EditorIndent(indent)
contentWindow.focus();
}
// Call this with insertAllowed = true to allow inserting if not in existing table,
// else use false to do nothing if not in a table
function EditorInsertOrEditTable(insertAllowed)
{
var selection = editorShell.editorSelection;
dump("Selection: Anchor: "+selection.anchorNode+selection.anchorOffset+" Focus: "+selection.focusNode+selection.focusOffset+"\n");
var table = editorShell.GetElementOrParentByTagName("table", null);
if (table) {
// Edit properties of existing table
dump("Existing table found ... Editing its properties\n");
window.openDialog("chrome://editor/content/EdTableProps.xul", "TableDlg", "chrome", "");
contentWindow.focus();
} else if(insertAllowed) {
EditorInsertTable();
}
}
function EditorInsertTable()
{
// Insert a new table
window.openDialog("chrome://editor/content/EdInsertTable.xul", "TableDlg", "chrome", "");
contentWindow.focus();
}
function EditorInsertTableCell(after)
{
editorShell.InsertTableCell(1,after);
contentWindow.focus();
}
// Just insert before current row or column for now
function EditorInsertTableRow()
{
editorShell.InsertTableRow(1,false);
contentWindow.focus();
}
function EditorInsertTableColumn()
{
editorShell.InsertTableColumn(1,false);
contentWindow.focus();
}
function JoinTableCells()
{
editorShell.JoinTableCells();
contentWindow.focus();
}
function EditorDeleteTable()
{
editorShell.DeleteTable();
contentWindow.focus();
}
function EditorDeleteTableRow()
{
editorShell.DeleteTableRow();
contentWindow.focus();
}
function EditorDeleteTableColumn()
{
editorShell.DeleteTableColumn();
contentWindow.focus();
}
function EditorDeleteTableCell()
{
editorShell.DeleteTableCell();
contentWindow.focus();
}
function EditorInsertList(listType)
{
dump("Inserting list\n");

4
editor/ui/dialogs/content/EdLinkProps.js
Просмотреть файл

@ -145,11 +145,11 @@ function initDialog()
}
}
function chooseFile()
function ChooseFile()
{
// Get a local file, converted into URL format
fileName = editorShell.GetLocalFileURL(window, "html");
if (fileName != "") {
if (StringExists(fileName)) {
hrefInput.value = fileName;
}
// Put focus into the input field

7
editor/ui/dialogs/content/EdLinkProps.xul
Просмотреть файл

@ -57,7 +57,7 @@
<xul:spring class="bigspacer"/>
<fieldset><legend align="left"> &LinkURLFieldset.label; </legend>
<!-- xul:box align="vertical" -->
<xul:box align="vertical" style="width: 100%; height: 100%">
<xul:box align="horizontal">
<div> &LinkURLEditField.label;</div>
<xul:spring flex="100%"/>
@ -66,9 +66,10 @@
<xul:box align="horizontal">
<input type="text" size="25" length="25" id="hrefInput"></input>
<xul:spring flex="100%"/>
<xul:titledbutton class="hspaced" id="ChooseFile" onclick="ChooseFile()" value="&LinkChooseFileButton.label;"/>
<!-- The div prevents button from being the same height as the input field -->
<div><xul:titledbutton class="hspaced" id="ChooseFile" onclick="ChooseFile()" value="&LinkChooseFileButton.label;"/></div>
</xul:box>
<!-- /xul:box -->
</xul:box>
</fieldset>
</xul:box>
<xul:spring class="bigspacer"/>