/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
(function()\r
{\r
- function removeRawAttribute( $node, attr )\r
- {\r
- if ( CKEDITOR.env.ie )\r
- $node.removeAttribute( attr );\r
- else\r
- delete $node[ attr ];\r
- }\r
-\r
var cellNodeRegex = /^(?:td|th)$/;\r
\r
function getSelectedCells( selection )\r
// So we have to take care to include a td we've entered only when we've\r
// walked into its children.\r
\r
- var parent = node.getParent();\r
- if ( parent && cellNodeRegex.test( parent.getName() ) && !parent.getCustomData( 'selected_cell' ) )\r
+ var parent = node.getAscendant( 'td' ) || node.getAscendant( 'th' );\r
+ if ( parent && !parent.getCustomData( 'selected_cell' ) )\r
{\r
CKEDITOR.dom.element.setMarker( database, parent, 'selected_cell', true );\r
retval.push( parent );\r
return retval;\r
}\r
\r
- function clearRow( $tr )\r
- {\r
- // Get the array of row's cells.\r
- var $cells = $tr.cells;\r
+ function getFocusElementAfterDelCells( cellsToDelete ) {\r
+ var i = 0,\r
+ last = cellsToDelete.length - 1,\r
+ database = {},\r
+ cell,focusedCell,\r
+ tr;\r
\r
- // Empty all cells.\r
- for ( var i = 0 ; i < $cells.length ; i++ )\r
- {\r
- $cells[ i ].innerHTML = '';\r
+ while ( ( cell = cellsToDelete[ i++ ] ) )\r
+ CKEDITOR.dom.element.setMarker( database, cell, 'delete_cell', true );\r
\r
- if ( !CKEDITOR.env.ie )\r
- ( new CKEDITOR.dom.element( $cells[ i ] ) ).appendBogus();\r
+ // 1.first we check left or right side focusable cell row by row;\r
+ i = 0;\r
+ while ( ( cell = cellsToDelete[ i++ ] ) )\r
+ {\r
+ if ( ( focusedCell = cell.getPrevious() ) && !focusedCell.getCustomData( 'delete_cell' )\r
+ || ( focusedCell = cell.getNext() ) && !focusedCell.getCustomData( 'delete_cell' ) )\r
+ {\r
+ CKEDITOR.dom.element.clearAllMarkers( database );\r
+ return focusedCell;\r
+ }\r
}\r
+\r
+ CKEDITOR.dom.element.clearAllMarkers( database );\r
+\r
+ // 2. then we check the toppest row (outside the selection area square) focusable cell\r
+ tr = cellsToDelete[ 0 ].getParent();\r
+ if ( ( tr = tr.getPrevious() ) )\r
+ return tr.getLast();\r
+\r
+ // 3. last we check the lowerest row focusable cell\r
+ tr = cellsToDelete[ last ].getParent();\r
+ if ( ( tr = tr.getNext() ) )\r
+ return tr.getChild( 0 );\r
+\r
+ return null;\r
}\r
\r
function insertRow( selection, insertBefore )\r
{\r
- // Get the row where the selection is placed in.\r
- var row = selection.getStartElement().getAscendant( 'tr' );\r
- if ( !row )\r
- return;\r
-\r
- // Create a clone of the row.\r
- var newRow = row.clone( true );\r
+ var cells = getSelectedCells( selection ),\r
+ firstCell = cells[ 0 ],\r
+ table = firstCell.getAscendant( 'table' ),\r
+ doc = firstCell.getDocument(),\r
+ startRow = cells[ 0 ].getParent(),\r
+ startRowIndex = startRow.$.rowIndex,\r
+ lastCell = cells[ cells.length - 1 ],\r
+ endRowIndex = lastCell.getParent().$.rowIndex + lastCell.$.rowSpan - 1,\r
+ endRow = new CKEDITOR.dom.element( table.$.rows[ endRowIndex ] ),\r
+ rowIndex = insertBefore ? startRowIndex : endRowIndex,\r
+ row = insertBefore ? startRow : endRow;\r
+\r
+ var map = CKEDITOR.tools.buildTableMap( table ),\r
+ cloneRow = map[ rowIndex ],\r
+ nextRow = insertBefore ? map[ rowIndex - 1 ] : map[ rowIndex + 1 ],\r
+ width = map[0].length;\r
+\r
+ var newRow = doc.createElement( 'tr' );\r
+ for ( var i = 0; i < width; i++ )\r
+ {\r
+ var cell;\r
+ // Check whether there's a spanning row here, do not break it.\r
+ if ( cloneRow[ i ].rowSpan > 1 && nextRow && cloneRow[ i ] == nextRow[ i ] )\r
+ {\r
+ cell = cloneRow[ i ];\r
+ cell.rowSpan += 1;\r
+ }\r
+ else\r
+ {\r
+ cell = new CKEDITOR.dom.element( cloneRow[ i ] ).clone();\r
+ cell.removeAttribute( 'rowSpan' );\r
+ !CKEDITOR.env.ie && cell.appendBogus();\r
+ newRow.append( cell );\r
+ cell = cell.$;\r
+ }\r
\r
- // Insert the new row before of it.\r
- newRow.insertBefore( row );\r
+ i += cell.colSpan - 1;\r
+ }\r
\r
- // Clean one of the rows to produce the illusion of inserting an empty row\r
- // before or after.\r
- clearRow( insertBefore ? newRow.$ : row.$ );\r
+ insertBefore ?\r
+ newRow.insertBefore( row ) :\r
+ newRow.insertAfter( row );\r
}\r
\r
function deleteRows( selectionOrRow )\r
{\r
if ( selectionOrRow instanceof CKEDITOR.dom.selection )\r
{\r
- var cells = getSelectedCells( selectionOrRow );\r
- var rowsToDelete = [];\r
-\r
- // Queue up the rows - it's possible and likely that we have duplicates.\r
- for ( var i = 0 ; i < cells.length ; i++ )\r
+ var cells = getSelectedCells( selectionOrRow ),\r
+ firstCell = cells[ 0 ],\r
+ table = firstCell.getAscendant( 'table' ),\r
+ map = CKEDITOR.tools.buildTableMap( table ),\r
+ startRow = cells[ 0 ].getParent(),\r
+ startRowIndex = startRow.$.rowIndex,\r
+ lastCell = cells[ cells.length - 1 ],\r
+ endRowIndex = lastCell.getParent().$.rowIndex + lastCell.$.rowSpan - 1,\r
+ rowsToDelete = [];\r
+\r
+ // Delete cell or reduce cell spans by checking through the table map.\r
+ for ( var i = startRowIndex; i <= endRowIndex; i++ )\r
{\r
- var row = cells[ i ].getParent();\r
- rowsToDelete[ row.$.rowIndex ] = row;\r
+ var mapRow = map[ i ],\r
+ row = new CKEDITOR.dom.element( table.$.rows[ i ] );\r
+\r
+ for ( var j = 0; j < mapRow.length; j++ )\r
+ {\r
+ var cell = new CKEDITOR.dom.element( mapRow[ j ] ),\r
+ cellRowIndex = cell.getParent().$.rowIndex;\r
+\r
+ if ( cell.$.rowSpan == 1 )\r
+ cell.remove();\r
+ // Row spanned cell.\r
+ else\r
+ {\r
+ // Span row of the cell, reduce spanning.\r
+ cell.$.rowSpan -= 1;\r
+ // Root row of the cell, root cell to next row.\r
+ if ( cellRowIndex == i )\r
+ {\r
+ var nextMapRow = map[ i + 1 ];\r
+ nextMapRow[ j - 1 ] ?\r
+ cell.insertAfter( new CKEDITOR.dom.element( nextMapRow[ j - 1 ] ) )\r
+ : new CKEDITOR.dom.element( table.$.rows[ i + 1 ] ).append( cell, 1 );\r
+ }\r
+ }\r
+\r
+ j += cell.$.colSpan - 1;\r
+ }\r
+\r
+ rowsToDelete.push( row );\r
}\r
\r
+ var rows = table.$.rows;\r
+\r
+ // Where to put the cursor after rows been deleted?\r
+ // 1. Into next sibling row if any;\r
+ // 2. Into previous sibling row if any;\r
+ // 3. Into table's parent element if it's the very last row.\r
+ var cursorPosition = new CKEDITOR.dom.element( rows[ endRowIndex + 1 ] || ( startRowIndex > 0 ? rows[ startRowIndex - 1 ] : null ) || table.$.parentNode );\r
+\r
for ( i = rowsToDelete.length ; i >= 0 ; i-- )\r
- {\r
- if ( rowsToDelete[ i ] )\r
- deleteRows( rowsToDelete[ i ] );\r
- }\r
+ deleteRows( rowsToDelete[ i ] );\r
+\r
+ return cursorPosition;\r
}\r
else if ( selectionOrRow instanceof CKEDITOR.dom.element )\r
{\r
- var table = selectionOrRow.getAscendant( 'table' );\r
+ table = selectionOrRow.getAscendant( 'table' );\r
\r
if ( table.$.rows.length == 1 )\r
table.remove();\r
else\r
selectionOrRow.remove();\r
}\r
+\r
+ return null;\r
}\r
\r
- function insertColumn( selection, insertBefore )\r
+ function getCellColIndex( cell, isStart )\r
{\r
- // Get the cell where the selection is placed in.\r
- var startElement = selection.getStartElement();\r
- var cell = startElement.getAscendant( 'td', true ) || startElement.getAscendant( 'th', true );\r
+ var row = cell.getParent(),\r
+ rowCells = row.$.cells;\r
\r
- if ( !cell )\r
- return;\r
+ var colIndex = 0;\r
+ for ( var i = 0; i < rowCells.length; i++ )\r
+ {\r
+ var mapCell = rowCells[ i ];\r
+ colIndex += isStart ? 1 : mapCell.colSpan;\r
+ if ( mapCell == cell.$ )\r
+ break;\r
+ }\r
\r
- // Get the cell's table.\r
- var table = cell.getAscendant( 'table' );\r
- var cellIndex = cell.$.cellIndex;\r
+ return colIndex -1;\r
+ }\r
\r
- // Loop through all rows available in the table.\r
- for ( var i = 0 ; i < table.$.rows.length ; i++ )\r
+ function getColumnsIndices( cells, isStart )\r
+ {\r
+ var retval = isStart ? Infinity : 0;\r
+ for ( var i = 0; i < cells.length; i++ )\r
{\r
- var $row = table.$.rows[ i ];\r
+ var colIndex = getCellColIndex( cells[ i ], isStart );\r
+ if ( isStart ? colIndex < retval : colIndex > retval )\r
+ retval = colIndex;\r
+ }\r
+ return retval;\r
+ }\r
\r
- // If the row doesn't have enough cells, ignore it.\r
- if ( $row.cells.length < ( cellIndex + 1 ) )\r
- continue;\r
+ function insertColumn( selection, insertBefore )\r
+ {\r
+ var cells = getSelectedCells( selection ),\r
+ firstCell = cells[ 0 ],\r
+ table = firstCell.getAscendant( 'table' ),\r
+ startCol = getColumnsIndices( cells, 1 ),\r
+ lastCol = getColumnsIndices( cells ),\r
+ colIndex = insertBefore? startCol : lastCol;\r
\r
- cell = new CKEDITOR.dom.element( $row.cells[ cellIndex ].cloneNode( false ) );\r
+ var map = CKEDITOR.tools.buildTableMap( table ),\r
+ cloneCol = [],\r
+ nextCol = [],\r
+ height = map.length;\r
\r
- if ( !CKEDITOR.env.ie )\r
- cell.appendBogus();\r
+ for ( var i = 0; i < height; i++ )\r
+ {\r
+ cloneCol.push( map[ i ][ colIndex ] );\r
+ var nextCell = insertBefore ? map[ i ][ colIndex - 1 ] : map[ i ][ colIndex + 1 ];\r
+ nextCell && nextCol.push( nextCell );\r
+ }\r
\r
- // Get back the currently selected cell.\r
- var baseCell = new CKEDITOR.dom.element( $row.cells[ cellIndex ] );\r
- if ( insertBefore )\r
- cell.insertBefore( baseCell );\r
+ for ( i = 0; i < height; i++ )\r
+ {\r
+ var cell;\r
+ // Check whether there's a spanning column here, do not break it.\r
+ if ( cloneCol[ i ].colSpan > 1\r
+ && nextCol.length\r
+ && nextCol[ i ] == cloneCol[ i ] )\r
+ {\r
+ cell = cloneCol[ i ];\r
+ cell.colSpan += 1;\r
+ }\r
else\r
- cell.insertAfter( baseCell );\r
+ {\r
+ cell = new CKEDITOR.dom.element( cloneCol[ i ] ).clone();\r
+ cell.removeAttribute( 'colSpan' );\r
+ !CKEDITOR.env.ie && cell.appendBogus();\r
+ cell[ insertBefore? 'insertBefore' : 'insertAfter' ].call( cell, new CKEDITOR.dom.element ( cloneCol[ i ] ) );\r
+ cell = cell.$;\r
+ }\r
+\r
+ i += cell.rowSpan - 1;\r
}\r
}\r
\r
function deleteColumns( selectionOrCell )\r
{\r
- if ( selectionOrCell instanceof CKEDITOR.dom.selection )\r
+ var cells = getSelectedCells( selectionOrCell ),\r
+ firstCell = cells[ 0 ],\r
+ lastCell = cells[ cells.length - 1 ],\r
+ table = firstCell.getAscendant( 'table' ),\r
+ map = CKEDITOR.tools.buildTableMap( table ),\r
+ startColIndex,\r
+ endColIndex,\r
+ rowsToDelete = [];\r
+\r
+ // Figure out selected cells' column indices.\r
+ for ( var i = 0, rows = map.length; i < rows; i++ )\r
{\r
- var colsToDelete = getSelectedCells( selectionOrCell );\r
- for ( var i = colsToDelete.length ; i >= 0 ; i-- )\r
+ for ( var j = 0, cols = map[ i ].length; j < cols; j++ )\r
{\r
- if ( colsToDelete[ i ] )\r
- deleteColumns( colsToDelete[ i ] );\r
+ if ( map[ i ][ j ] == firstCell.$ )\r
+ startColIndex = j;\r
+ if ( map[ i ][ j ] == lastCell.$ )\r
+ endColIndex = j;\r
}\r
}\r
- else if ( selectionOrCell instanceof CKEDITOR.dom.element )\r
- {\r
- // Get the cell's table.\r
- var table = selectionOrCell.getAscendant( 'table' );\r
\r
- // Get the cell index.\r
- var cellIndex = selectionOrCell.$.cellIndex;\r
-\r
- /*\r
- * Loop through all rows from down to up, coz it's possible that some rows\r
- * will be deleted.\r
- */\r
- for ( i = table.$.rows.length - 1 ; i >= 0 ; i-- )\r
+ // Delete cell or reduce cell spans by checking through the table map.\r
+ for ( i = startColIndex; i <= endColIndex; i++ )\r
+ {\r
+ for ( j = 0; j < map.length; j++ )\r
{\r
- // Get the row.\r
- var row = new CKEDITOR.dom.element( table.$.rows[ i ] );\r
+ var mapRow = map[ j ],\r
+ row = new CKEDITOR.dom.element( table.$.rows[ j ] ),\r
+ cell = new CKEDITOR.dom.element( mapRow[ i ] );\r
\r
- // If the cell to be removed is the first one and the row has just one cell.\r
- if ( !cellIndex && row.$.cells.length == 1 )\r
+ if ( cell.$ )\r
{\r
- deleteRows( row );\r
- continue;\r
+ if ( cell.$.colSpan == 1 )\r
+ cell.remove();\r
+ // Reduce the col spans.\r
+ else\r
+ cell.$.colSpan -= 1;\r
+\r
+ j += cell.$.rowSpan - 1;\r
+\r
+ if ( !row.$.cells.length )\r
+ rowsToDelete.push( row );\r
}\r
+ }\r
+ }\r
+\r
+ var firstRowCells = table.$.rows[ 0 ] && table.$.rows[ 0 ].cells;\r
+\r
+ // Where to put the cursor after columns been deleted?\r
+ // 1. Into next cell of the first row if any;\r
+ // 2. Into previous cell of the first row if any;\r
+ // 3. Into table's parent element;\r
+ var cursorPosition = new CKEDITOR.dom.element( firstRowCells[ startColIndex ] || ( startColIndex ? firstRowCells[ startColIndex - 1 ] : table.$.parentNode ) );\r
+\r
+ // Delete table rows only if all columns are gone (do not remove empty row).\r
+ if ( rowsToDelete.length == rows )\r
+ table.remove();\r
+\r
+ return cursorPosition;\r
+ }\r
\r
- // Else, just delete the cell.\r
- if ( row.$.cells[ cellIndex ] )\r
- row.$.removeChild( row.$.cells[ cellIndex ] );\r
+ function getFocusElementAfterDelCols( cells )\r
+ {\r
+ var cellIndexList = [],\r
+ table = cells[ 0 ] && cells[ 0 ].getAscendant( 'table' ),\r
+ i, length,\r
+ targetIndex, targetCell;\r
+\r
+ // get the cellIndex list of delete cells\r
+ for ( i = 0, length = cells.length; i < length; i++ )\r
+ cellIndexList.push( cells[i].$.cellIndex );\r
+\r
+ // get the focusable column index\r
+ cellIndexList.sort();\r
+ for ( i = 1, length = cellIndexList.length; i < length; i++ )\r
+ {\r
+ if ( cellIndexList[ i ] - cellIndexList[ i - 1 ] > 1 )\r
+ {\r
+ targetIndex = cellIndexList[ i - 1 ] + 1;\r
+ break;\r
}\r
}\r
+\r
+ if ( !targetIndex )\r
+ targetIndex = cellIndexList[ 0 ] > 0 ? ( cellIndexList[ 0 ] - 1 )\r
+ : ( cellIndexList[ cellIndexList.length - 1 ] + 1 );\r
+\r
+ // scan row by row to get the target cell\r
+ var rows = table.$.rows;\r
+ for ( i = 0, length = rows.length; i < length ; i++ )\r
+ {\r
+ targetCell = rows[ i ].cells[ targetIndex ];\r
+ if ( targetCell )\r
+ break;\r
+ }\r
+\r
+ return targetCell ? new CKEDITOR.dom.element( targetCell ) : table.getPrevious();\r
}\r
\r
function insertCell( selection, insertBefore )\r
{\r
var startElement = selection.getStartElement();\r
- var cell = startElement.getAscendant( 'td', true ) || startElement.getAscendant( 'th', true );\r
+ var cell = startElement.getAscendant( 'td', 1 ) || startElement.getAscendant( 'th', 1 );\r
\r
if ( !cell )\r
return;\r
if ( selectionOrCell instanceof CKEDITOR.dom.selection )\r
{\r
var cellsToDelete = getSelectedCells( selectionOrCell );\r
+ var table = cellsToDelete[ 0 ] && cellsToDelete[ 0 ].getAscendant( 'table' );\r
+ var cellToFocus = getFocusElementAfterDelCells( cellsToDelete );\r
+\r
for ( var i = cellsToDelete.length - 1 ; i >= 0 ; i-- )\r
deleteCells( cellsToDelete[ i ] );\r
+\r
+ if ( cellToFocus )\r
+ placeCursorInCell( cellToFocus, true );\r
+ else if ( table )\r
+ table.remove();\r
}\r
else if ( selectionOrCell instanceof CKEDITOR.dom.element )\r
{\r
- if ( selectionOrCell.getParent().getChildCount() == 1 )\r
- selectionOrCell.getParent().remove();\r
+ var tr = selectionOrCell.getParent();\r
+ if ( tr.getChildCount() == 1 )\r
+ tr.remove();\r
else\r
selectionOrCell.remove();\r
}\r
range.select( true );\r
}\r
\r
- function buildTableMap( table )\r
- {\r
-\r
- var aRows = table.$.rows ;\r
-\r
- // Row and Column counters.\r
- var r = -1 ;\r
-\r
- var aMap = [];\r
-\r
- for ( var i = 0 ; i < aRows.length ; i++ )\r
- {\r
- r++ ;\r
- !aMap[r] && ( aMap[r] = [] );\r
-\r
- var c = -1 ;\r
-\r
- for ( var j = 0 ; j < aRows[i].cells.length ; j++ )\r
- {\r
- var oCell = aRows[i].cells[j] ;\r
-\r
- c++ ;\r
- while ( aMap[r][c] )\r
- c++ ;\r
-\r
- var iColSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ;\r
- var iRowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ;\r
-\r
- for ( var rs = 0 ; rs < iRowSpan ; rs++ )\r
- {\r
- if ( !aMap[r + rs] )\r
- aMap[r + rs] = new Array() ;\r
-\r
- for ( var cs = 0 ; cs < iColSpan ; cs++ )\r
- {\r
- aMap[r + rs][c + cs] = aRows[i].cells[j] ;\r
- }\r
- }\r
-\r
- c += iColSpan - 1 ;\r
- }\r
- }\r
- return aMap ;\r
- }\r
-\r
function cellInRow( tableMap, rowIndex, cell )\r
{\r
var oRow = tableMap[ rowIndex ];\r
- if( typeof cell == 'undefined' )\r
+ if ( typeof cell == 'undefined' )\r
return oRow;\r
\r
for ( var c = 0 ; oRow && c < oRow.length ; c++ )\r
{\r
if ( cell.is && oRow[c] == cell.$ )\r
return c;\r
- else if( c == cell )\r
+ else if ( c == cell )\r
return new CKEDITOR.dom.element( oRow[ c ] );\r
}\r
return cell.is ? -1 : null;\r
for ( var r = 0; r < tableMap.length; r++ )\r
{\r
var row = tableMap[ r ];\r
- if( typeof cell == 'undefined' )\r
+ if ( typeof cell == 'undefined' )\r
oCol.push( row[ colIndex ] );\r
- else if( cell.is && row[ colIndex ] == cell.$ )\r
+ else if ( cell.is && row[ colIndex ] == cell.$ )\r
return r;\r
- else if( r == cell )\r
+ else if ( r == cell )\r
return new CKEDITOR.dom.element( row[ colIndex ] );\r
}\r
\r
var cell,\r
firstCell = cells[ 0 ],\r
table = firstCell.getAscendant( 'table' ),\r
- map = buildTableMap( table ),\r
+ map = CKEDITOR.tools.buildTableMap( table ),\r
mapHeight = map.length,\r
mapWidth = map[ 0 ].length,\r
startRow = firstCell.getParent().$.rowIndex,\r
startColumn = cellInRow( map, startRow, firstCell );\r
\r
- if( mergeDirection )\r
+ if ( mergeDirection )\r
{\r
var targetCell;\r
try\r
{\r
+ var rowspan = parseInt( firstCell.getAttribute( 'rowspan' ), 10 ) || 1;\r
+ var colspan = parseInt( firstCell.getAttribute( 'colspan' ), 10 ) || 1;\r
+\r
targetCell =\r
map[ mergeDirection == 'up' ?\r
- ( startRow - 1 ):\r
- mergeDirection == 'down' ? ( startRow + 1 ) : startRow ] [\r
- mergeDirection == 'left' ?\r
- ( startColumn - 1 ):\r
- mergeDirection == 'right' ? ( startColumn + 1 ) : startColumn ];\r
+ ( startRow - rowspan ):\r
+ mergeDirection == 'down' ? ( startRow + rowspan ) : startRow ] [\r
+ mergeDirection == 'left' ?\r
+ ( startColumn - colspan ):\r
+ mergeDirection == 'right' ? ( startColumn + colspan ) : startColumn ];\r
\r
}\r
catch( er )\r
\r
// 1. No cell could be merged.\r
// 2. Same cell actually.\r
- if( !targetCell || firstCell.$ == targetCell )\r
+ if ( !targetCell || firstCell.$ == targetCell )\r
return false;\r
\r
// Sort in map order regardless of the DOM sequence.\r
if ( !isDetect )\r
{\r
// Trim all cell fillers and check to remove empty cells.\r
- if( trimCell( cell ), cell.getChildren().count() )\r
+ if ( trimCell( cell ), cell.getChildren().count() )\r
{\r
// Merge vertically cells as two separated paragraphs.\r
- if( rowIndex != lastRowIndex\r
+ if ( rowIndex != lastRowIndex\r
&& cellFirstChild\r
&& !( cellFirstChild.isBlockBoundary\r
&& cellFirstChild.isBlockBoundary( { br : 1 } ) ) )\r
{\r
var last = frag.getLast( CKEDITOR.dom.walker.whitespaces( true ) );\r
- if( last && !( last.is && last.is( 'br' ) ) )\r
- frag.append( new CKEDITOR.dom.element( 'br' ) );\r
+ if ( last && !( last.is && last.is( 'br' ) ) )\r
+ frag.append( 'br' );\r
}\r
\r
cell.moveChildren( frag );\r
{\r
frag.moveChildren( firstCell );\r
\r
- if( !CKEDITOR.env.ie )\r
+ if ( !CKEDITOR.env.ie )\r
firstCell.appendBogus();\r
\r
- if( totalColSpan >= mapWidth )\r
+ if ( totalColSpan >= mapWidth )\r
firstCell.removeAttribute( 'rowSpan' );\r
else\r
firstCell.$.rowSpan = totalRowSpan;\r
\r
- if( totalRowSpan >= mapHeight )\r
+ if ( totalRowSpan >= mapHeight )\r
firstCell.removeAttribute( 'colSpan' );\r
else\r
firstCell.$.colSpan = totalColSpan;\r
for ( i = count - 1; i >= 0; i-- )\r
{\r
var tailTr = trs.getItem( i );\r
- if( !tailTr.$.cells.length )\r
+ if ( !tailTr.$.cells.length )\r
{\r
tailTr.remove();\r
count++;\r
function verticalSplitCell ( selection, isDetect )\r
{\r
var cells = getSelectedCells( selection );\r
- if( cells.length > 1 )\r
+ if ( cells.length > 1 )\r
return false;\r
- else if( isDetect )\r
+ else if ( isDetect )\r
return true;\r
\r
var cell = cells[ 0 ],\r
tr = cell.getParent(),\r
table = tr.getAscendant( 'table' ),\r
- map = buildTableMap( table ),\r
+ map = CKEDITOR.tools.buildTableMap( table ),\r
rowIndex = tr.$.rowIndex,\r
colIndex = cellInRow( map, rowIndex, cell ),\r
rowSpan = cell.$.rowSpan,\r
newCellRowSpan,\r
newRowIndex;\r
\r
- if( rowSpan > 1 )\r
+ if ( rowSpan > 1 )\r
{\r
newRowSpan = Math.ceil( rowSpan / 2 );\r
newCellRowSpan = Math.floor( rowSpan / 2 );\r
{\r
candidateCell = newCellRow[ c ];\r
// Catch first cell actually following the column.\r
- if( candidateCell.parentNode == newCellTr.$\r
+ if ( candidateCell.parentNode == newCellTr.$\r
&& c > colIndex )\r
{\r
newCell.insertBefore( new CKEDITOR.dom.element( candidateCell ) );\r
}\r
\r
// The destination row is empty, append at will.\r
- if( !candidateCell )\r
+ if ( !candidateCell )\r
newCellTr.append( newCell, true );\r
}\r
else\r
cellsInSameRow[ i ].rowSpan++;\r
}\r
\r
- if( !CKEDITOR.env.ie )\r
+ if ( !CKEDITOR.env.ie )\r
newCell.appendBogus();\r
\r
cell.$.rowSpan = newRowSpan;\r
newCell.$.rowSpan = newCellRowSpan;\r
- if( newRowSpan == 1 )\r
+ if ( newRowSpan == 1 )\r
cell.removeAttribute( 'rowSpan' );\r
- if( newCellRowSpan == 1 )\r
+ if ( newCellRowSpan == 1 )\r
newCell.removeAttribute( 'rowSpan' );\r
\r
return newCell;\r
function horizontalSplitCell( selection, isDetect )\r
{\r
var cells = getSelectedCells( selection );\r
- if( cells.length > 1 )\r
+ if ( cells.length > 1 )\r
return false;\r
- else if( isDetect )\r
+ else if ( isDetect )\r
return true;\r
\r
var cell = cells[ 0 ],\r
tr = cell.getParent(),\r
table = tr.getAscendant( 'table' ),\r
- map = buildTableMap( table ),\r
+ map = CKEDITOR.tools.buildTableMap( table ),\r
rowIndex = tr.$.rowIndex,\r
colIndex = cellInRow( map, rowIndex, cell ),\r
colSpan = cell.$.colSpan,\r
newColSpan,\r
newCellColSpan;\r
\r
- if( colSpan > 1 )\r
+ if ( colSpan > 1 )\r
{\r
newColSpan = Math.ceil( colSpan / 2 );\r
newCellColSpan = Math.floor( colSpan / 2 );\r
}\r
newCell = cell.clone();\r
newCell.insertAfter( cell );\r
- if( !CKEDITOR.env.ie )\r
+ if ( !CKEDITOR.env.ie )\r
newCell.appendBogus();\r
\r
cell.$.colSpan = newColSpan;\r
newCell.$.colSpan = newCellColSpan;\r
- if( newColSpan == 1 )\r
+ if ( newColSpan == 1 )\r
cell.removeAttribute( 'colSpan' );\r
- if( newCellColSpan == 1 )\r
+ if ( newCellColSpan == 1 )\r
newCell.removeAttribute( 'colSpan' );\r
\r
return newCell;\r
{\r
exec : function( editor )\r
{\r
- var selection = editor.getSelection();\r
- var startElement = selection && selection.getStartElement();\r
- var table = startElement && startElement.getAscendant( 'table', true );\r
+ var selection = editor.getSelection(),\r
+ startElement = selection && selection.getStartElement(),\r
+ table = startElement && startElement.getAscendant( 'table', 1 );\r
\r
if ( !table )\r
return;\r
\r
- // Maintain the selection point at where the table was deleted.\r
- selection.selectElement( table );\r
- var range = selection.getRanges()[0];\r
- range.collapse();\r
- selection.selectRanges( [ range ] );\r
-\r
- // If the table's parent has only one child, remove it as well.\r
- if ( table.getParent().getChildCount() == 1 )\r
- table.getParent().remove();\r
- else\r
- table.remove();\r
+ // If the table's parent has only one child remove it as well (unless it's the body or a table cell) (#5416, #6289)\r
+ var parent = table.getParent();\r
+ if ( parent.getChildCount() == 1 && !parent.is( 'body', 'td', 'th' ) )\r
+ table = parent;\r
+\r
+ var range = new CKEDITOR.dom.range( editor.document );\r
+ range.moveToPosition( table, CKEDITOR.POSITION_BEFORE_START );\r
+ table.remove();\r
+ range.select();\r
}\r
} );\r
\r
exec : function( editor )\r
{\r
var selection = editor.getSelection();\r
- deleteRows( selection );\r
+ placeCursorInCell( deleteRows( selection ) );\r
}\r
} );\r
\r
exec : function( editor )\r
{\r
var selection = editor.getSelection();\r
- deleteColumns( selection );\r
+ var element = deleteColumns( selection );\r
+ element && placeCursorInCell( element, true );\r
}\r
} );\r
\r
{\r
editor.contextMenu.addListener( function( element, selection )\r
{\r
- if ( !element )\r
+ if ( !element || element.isReadOnly() )\r
return null;\r
\r
while ( element )\r
};\r
CKEDITOR.plugins.add( 'tabletools', CKEDITOR.plugins.tabletools );\r
})();\r
+\r
+/**\r
+ * Create a two-dimension array that reflects the actual layout of table cells,\r
+ * with cell spans, with mappings to the original td elements.\r
+ * @param table {CKEDITOR.dom.element}\r
+ */\r
+CKEDITOR.tools.buildTableMap = function ( table )\r
+{\r
+ var aRows = table.$.rows ;\r
+\r
+ // Row and Column counters.\r
+ var r = -1 ;\r
+\r
+ var aMap = [];\r
+\r
+ for ( var i = 0 ; i < aRows.length ; i++ )\r
+ {\r
+ r++ ;\r
+ !aMap[r] && ( aMap[r] = [] );\r
+\r
+ var c = -1 ;\r
+\r
+ for ( var j = 0 ; j < aRows[i].cells.length ; j++ )\r
+ {\r
+ var oCell = aRows[i].cells[j] ;\r
+\r
+ c++ ;\r
+ while ( aMap[r][c] )\r
+ c++ ;\r
+\r
+ var iColSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ;\r
+ var iRowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ;\r
+\r
+ for ( var rs = 0 ; rs < iRowSpan ; rs++ )\r
+ {\r
+ if ( !aMap[r + rs] )\r
+ aMap[r + rs] = [];\r
+\r
+ for ( var cs = 0 ; cs < iColSpan ; cs++ )\r
+ {\r
+ aMap[r + rs][c + cs] = aRows[i].cells[j] ;\r
+ }\r
+ }\r
+\r
+ c += iColSpan - 1 ;\r
+ }\r
+ }\r
+ return aMap ;\r
+};\r
Got questions, comments, patches, etc.? Contact Jason Woofenden