return retval;\r
}\r
\r
+ function getFocusElementAfterDelCells( cellsToDelete ) {\r
+ var i = 0,\r
+ last = cellsToDelete.length - 1,\r
+ database = {},\r
+ cell,focusedCell,\r
+ tr;\r
+\r
+ while ( ( cell = cellsToDelete[ i++ ] ) )\r
+ CKEDITOR.dom.element.setMarker( database, cell, 'delete_cell', true );\r
+\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 clearRow( $tr )\r
{\r
// Get the array of row's cells.\r
if ( $row.cells.length < ( cellIndex + 1 ) )\r
continue;\r
\r
- cell = new CKEDITOR.dom.element( $row.cells[ cellIndex ].cloneNode( false ) );\r
+ cell = ( new CKEDITOR.dom.element( $row.cells[ cellIndex ] ) ).clone( false );\r
\r
if ( !CKEDITOR.env.ie )\r
cell.appendBogus();\r
}\r
}\r
\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 deleteColumns( selectionOrCell )\r
{\r
if ( selectionOrCell instanceof CKEDITOR.dom.selection )\r
{\r
- var colsToDelete = getSelectedCells( selectionOrCell );\r
- for ( var i = colsToDelete.length ; i >= 0 ; i-- )\r
+ var colsToDelete = getSelectedCells( selectionOrCell ),\r
+ elementToFocus = getFocusElementAfterDelCols( colsToDelete );\r
+\r
+ for ( var i = colsToDelete.length - 1 ; i >= 0 ; i-- )\r
{\r
if ( colsToDelete[ i ] )\r
deleteColumns( colsToDelete[ i ] );\r
}\r
+\r
+ return elementToFocus;\r
}\r
else if ( selectionOrCell instanceof CKEDITOR.dom.element )\r
{\r
// Get the cell's table.\r
var table = selectionOrCell.getAscendant( 'table' );\r
+ if ( !table )\r
+ return null;\r
\r
// Get the cell index.\r
var cellIndex = selectionOrCell.$.cellIndex;\r
row.$.removeChild( row.$.cells[ cellIndex ] );\r
}\r
}\r
+\r
+ return null;\r
}\r
\r
function insertCell( selection, insertBefore )\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.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
+ // If the table's parent has only one child, remove it,except body,as well.( #5416 )\r
+ var parent = table.getParent();\r
+ if ( parent.getChildCount() == 1 && parent.getName() != 'body' )\r
+ parent.remove();\r
else\r
table.remove();\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
Got questions, comments, patches, etc.? Contact Jason Woofenden