X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ftabletools%2Fplugin.js;h=520e11d11f2c870a7299ab0f5d518306e2635b98;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=d68954a52a420bd0cc68e287c8da934894f4a1b0;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git diff --git a/_source/plugins/tabletools/plugin.js b/_source/plugins/tabletools/plugin.js index d68954a..520e11d 100644 --- a/_source/plugins/tabletools/plugin.js +++ b/_source/plugins/tabletools/plugin.js @@ -1,26 +1,14 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ (function() { - function removeRawAttribute( $node, attr ) - { - if ( CKEDITOR.env.ie ) - $node.removeAttribute( attr ); - else - delete $node[ attr ]; - } - var cellNodeRegex = /^(?:td|th)$/; function getSelectedCells( selection ) { - // Walker will try to split text nodes, which will make the current selection - // invalid. So save bookmarks before doing anything. - var bookmarks = selection.createBookmarks(); - var ranges = selection.getRanges(); var retval = []; var database = {}; @@ -68,8 +56,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // So we have to take care to include a td we've entered only when we've // walked into its children. - var parent = node.getParent(); - if ( parent && cellNodeRegex.test( parent.getName() ) && !parent.getCustomData( 'selected_cell' ) ) + var parent = node.getAscendant( 'td' ) || node.getAscendant( 'th' ); + if ( parent && !parent.getCustomData( 'selected_cell' ) ) { CKEDITOR.dom.element.setMarker( database, parent, 'selected_cell', true ); retval.push( parent ); @@ -80,347 +68,714 @@ For licensing, see LICENSE.html or http://ckeditor.com/license CKEDITOR.dom.element.clearAllMarkers( database ); - // Restore selection position. - selection.selectBookmarks( bookmarks ); - return retval; } - function createTableMap( $refCell ) - { - var refCell = new CKEDITOR.dom.element( $refCell ); - var $table = ( refCell.getName() == 'table' ? $refCell : refCell.getAscendant( 'table' ) ).$; - var $rows = $table.rows; - - // Row and column counters. - var r = -1; - var map = []; - for ( var i = 0 ; i < $rows.length ; i++ ) + function getFocusElementAfterDelCells( cellsToDelete ) { + var i = 0, + last = cellsToDelete.length - 1, + database = {}, + cell,focusedCell, + tr; + + while ( ( cell = cellsToDelete[ i++ ] ) ) + CKEDITOR.dom.element.setMarker( database, cell, 'delete_cell', true ); + + // 1.first we check left or right side focusable cell row by row; + i = 0; + while ( ( cell = cellsToDelete[ i++ ] ) ) { - r++; - if ( !map[ r ] ) - map[ r ] = []; + if ( ( focusedCell = cell.getPrevious() ) && !focusedCell.getCustomData( 'delete_cell' ) + || ( focusedCell = cell.getNext() ) && !focusedCell.getCustomData( 'delete_cell' ) ) + { + CKEDITOR.dom.element.clearAllMarkers( database ); + return focusedCell; + } + } + + CKEDITOR.dom.element.clearAllMarkers( database ); + + // 2. then we check the toppest row (outside the selection area square) focusable cell + tr = cellsToDelete[ 0 ].getParent(); + if ( ( tr = tr.getPrevious() ) ) + return tr.getLast(); - var c = -1; + // 3. last we check the lowerest row focusable cell + tr = cellsToDelete[ last ].getParent(); + if ( ( tr = tr.getNext() ) ) + return tr.getChild( 0 ); - for ( var j = 0 ; j < $rows[ i ].cells.length ; j++ ) + return null; + } + + function insertRow( selection, insertBefore ) + { + var cells = getSelectedCells( selection ), + firstCell = cells[ 0 ], + table = firstCell.getAscendant( 'table' ), + doc = firstCell.getDocument(), + startRow = cells[ 0 ].getParent(), + startRowIndex = startRow.$.rowIndex, + lastCell = cells[ cells.length - 1 ], + endRowIndex = lastCell.getParent().$.rowIndex + lastCell.$.rowSpan - 1, + endRow = new CKEDITOR.dom.element( table.$.rows[ endRowIndex ] ), + rowIndex = insertBefore ? startRowIndex : endRowIndex, + row = insertBefore ? startRow : endRow; + + var map = CKEDITOR.tools.buildTableMap( table ), + cloneRow = map[ rowIndex ], + nextRow = insertBefore ? map[ rowIndex - 1 ] : map[ rowIndex + 1 ], + width = map[0].length; + + var newRow = doc.createElement( 'tr' ); + for ( var i = 0; cloneRow[ i ] && i < width; i++ ) + { + var cell; + // Check whether there's a spanning row here, do not break it. + if ( cloneRow[ i ].rowSpan > 1 && nextRow && cloneRow[ i ] == nextRow[ i ] ) { - var $cell = $rows[ i ].cells[ j ]; + cell = cloneRow[ i ]; + cell.rowSpan += 1; + } + else + { + cell = new CKEDITOR.dom.element( cloneRow[ i ] ).clone(); + cell.removeAttribute( 'rowSpan' ); + !CKEDITOR.env.ie && cell.appendBogus(); + newRow.append( cell ); + cell = cell.$; + } - c++; - while ( map[ r ][ c ] ) - c++; + i += cell.colSpan - 1; + } - var colSpan = isNaN( $cell.colSpan ) ? 1 : $cell.colSpan; - var rowSpan = isNaN( $cell.rowSpan ) ? 1 : $cell.rowSpan; + insertBefore ? + newRow.insertBefore( row ) : + newRow.insertAfter( row ); + } - for ( var rs = 0 ; rs < rowSpan ; rs++ ) + function deleteRows( selectionOrRow ) + { + if ( selectionOrRow instanceof CKEDITOR.dom.selection ) + { + var cells = getSelectedCells( selectionOrRow ), + firstCell = cells[ 0 ], + table = firstCell.getAscendant( 'table' ), + map = CKEDITOR.tools.buildTableMap( table ), + startRow = cells[ 0 ].getParent(), + startRowIndex = startRow.$.rowIndex, + lastCell = cells[ cells.length - 1 ], + endRowIndex = lastCell.getParent().$.rowIndex + lastCell.$.rowSpan - 1, + rowsToDelete = []; + + // Delete cell or reduce cell spans by checking through the table map. + for ( var i = startRowIndex; i <= endRowIndex; i++ ) + { + var mapRow = map[ i ], + row = new CKEDITOR.dom.element( table.$.rows[ i ] ); + + for ( var j = 0; j < mapRow.length; j++ ) { - if ( !map[ r + rs ] ) - map[ r + rs ] = []; + var cell = new CKEDITOR.dom.element( mapRow[ j ] ), + cellRowIndex = cell.getParent().$.rowIndex; - for ( var cs = 0 ; cs < colSpan ; cs++ ) - map [ r + rs ][ c + cs ] = $rows[ i ].cells[ j ]; + if ( cell.$.rowSpan == 1 ) + cell.remove(); + // Row spanned cell. + else + { + // Span row of the cell, reduce spanning. + cell.$.rowSpan -= 1; + // Root row of the cell, root cell to next row. + if ( cellRowIndex == i ) + { + var nextMapRow = map[ i + 1 ]; + nextMapRow[ j - 1 ] ? + cell.insertAfter( new CKEDITOR.dom.element( nextMapRow[ j - 1 ] ) ) + : new CKEDITOR.dom.element( table.$.rows[ i + 1 ] ).append( cell, 1 ); + } + } + + j += cell.$.colSpan - 1; } - c += colSpan - 1; + rowsToDelete.push( row ); } + + var rows = table.$.rows; + + // Where to put the cursor after rows been deleted? + // 1. Into next sibling row if any; + // 2. Into previous sibling row if any; + // 3. Into table's parent element if it's the very last row. + var cursorPosition = new CKEDITOR.dom.element( rows[ endRowIndex + 1 ] || ( startRowIndex > 0 ? rows[ startRowIndex - 1 ] : null ) || table.$.parentNode ); + + for ( i = rowsToDelete.length ; i >= 0 ; i-- ) + deleteRows( rowsToDelete[ i ] ); + + return cursorPosition; } + else if ( selectionOrRow instanceof CKEDITOR.dom.element ) + { + table = selectionOrRow.getAscendant( 'table' ); - return map; + if ( table.$.rows.length == 1 ) + table.remove(); + else + selectionOrRow.remove(); + } + + return null; } - function installTableMap( tableMap, $table ) + function getCellColIndex( cell, isStart ) { - /* - * IE BUG: rowSpan is always 1 in IE if the cell isn't attached to a row. So - * store is separately in another attribute. (#1917) - */ - var rowSpanAttr = CKEDITOR.env.ie ? '_cke_rowspan' : 'rowSpan'; - - /* - * Disconnect all the cells in tableMap from their parents, set all colSpan - * and rowSpan attributes to 1. - */ - for ( var i = 0 ; i < tableMap.length ; i++ ) + var row = cell.getParent(), + rowCells = row.$.cells; + + var colIndex = 0; + for ( var i = 0; i < rowCells.length; i++ ) { - for ( var j = 0 ; j < tableMap[ i ].length ; j++ ) - { - var $cell = tableMap[ i ][ j ]; - if ( $cell.parentNode ) - $cell.parentNode.removeChild( $cell ); - $cell.colSpan = $cell[ rowSpanAttr ] = 1; - } + var mapCell = rowCells[ i ]; + colIndex += isStart ? 1 : mapCell.colSpan; + if ( mapCell == cell.$ ) + break; } - // Scan by rows and set colSpan. - var maxCol = 0; - for ( i = 0 ; i < tableMap.length ; i++ ) + return colIndex -1; + } + + function getColumnsIndices( cells, isStart ) + { + var retval = isStart ? Infinity : 0; + for ( var i = 0; i < cells.length; i++ ) { - for ( j = 0 ; j < tableMap[ i ].length ; j++ ) - { - $cell = tableMap[ i ][ j ]; - if ( !$cell ) - continue; - if ( j > maxCol ) - maxCol = j; - if ( $cell[ '_cke_colScanned' ] ) - continue; - if ( tableMap[ i ][ j - 1 ] == $cell ) - $cell.colSpan++; - if ( tableMap[ i ][ j + 1 ] != $cell ) - $cell[ '_cke_colScanned' ] = 1; - } + var colIndex = getCellColIndex( cells[ i ], isStart ); + if ( isStart ? colIndex < retval : colIndex > retval ) + retval = colIndex; + } + return retval; + } + + function insertColumn( selection, insertBefore ) + { + var cells = getSelectedCells( selection ), + firstCell = cells[ 0 ], + table = firstCell.getAscendant( 'table' ), + startCol = getColumnsIndices( cells, 1 ), + lastCol = getColumnsIndices( cells ), + colIndex = insertBefore? startCol : lastCol; + + var map = CKEDITOR.tools.buildTableMap( table ), + cloneCol = [], + nextCol = [], + height = map.length; + + for ( var i = 0; i < height; i++ ) + { + cloneCol.push( map[ i ][ colIndex ] ); + var nextCell = insertBefore ? map[ i ][ colIndex - 1 ] : map[ i ][ colIndex + 1 ]; + nextCol.push( nextCell ); } - // Scan by columns and set rowSpan. - for ( i = 0 ; i <= maxCol ; i++ ) + for ( i = 0; i < height; i++ ) { - for ( j = 0 ; j < tableMap.length ; j++ ) + var cell; + + if ( !cloneCol[ i ] ) + continue; + + // Check whether there's a spanning column here, do not break it. + if ( cloneCol[ i ].colSpan > 1 + && nextCol[ i ] == cloneCol[ i ] ) { - if ( !tableMap[ j ] ) - continue; - $cell = tableMap[ j ][ i ]; - if ( !$cell || $cell[ '_cke_rowScanned' ] ) - continue; - if ( tableMap[ j - 1 ] && tableMap[ j - 1 ][ i ] == $cell ) - $cell[ rowSpanAttr ]++; - if ( !tableMap[ j + 1 ] || tableMap[ j + 1 ][ i ] != $cell ) - $cell[ '_cke_rowScanned' ] = 1; + cell = cloneCol[ i ]; + cell.colSpan += 1; + } + else + { + cell = new CKEDITOR.dom.element( cloneCol[ i ] ).clone(); + cell.removeAttribute( 'colSpan' ); + !CKEDITOR.env.ie && cell.appendBogus(); + cell[ insertBefore? 'insertBefore' : 'insertAfter' ].call( cell, new CKEDITOR.dom.element ( cloneCol[ i ] ) ); + cell = cell.$; } + + i += cell.rowSpan - 1; } + } - // Clear all temporary flags. - for ( i = 0 ; i < tableMap.length ; i++ ) + function deleteColumns( selectionOrCell ) + { + var cells = getSelectedCells( selectionOrCell ), + firstCell = cells[ 0 ], + lastCell = cells[ cells.length - 1 ], + table = firstCell.getAscendant( 'table' ), + map = CKEDITOR.tools.buildTableMap( table ), + startColIndex, + endColIndex, + rowsToDelete = []; + + // Figure out selected cells' column indices. + for ( var i = 0, rows = map.length; i < rows; i++ ) { - for ( j = 0 ; j < tableMap[ i ].length ; j++ ) + for ( var j = 0, cols = map[ i ].length; j < cols; j++ ) { - $cell = tableMap[ i ][ j ]; - removeRawAttribute( $cell, '_cke_colScanned' ); - removeRawAttribute( $cell, '_cke_rowScanned' ); + if ( map[ i ][ j ] == firstCell.$ ) + startColIndex = j; + if ( map[ i ][ j ] == lastCell.$ ) + endColIndex = j; } } - // Insert physical rows and columns to table. - for ( i = 0 ; i < tableMap.length ; i++ ) + // Delete cell or reduce cell spans by checking through the table map. + for ( i = startColIndex; i <= endColIndex; i++ ) { - var $row = $table.ownerDocument.createElement( 'tr' ); - for ( j = 0 ; j < tableMap[ i ].length ; ) + for ( j = 0; j < map.length; j++ ) { - $cell = tableMap[ i ][ j ]; - if ( tableMap[ i - 1 ] && tableMap[ i - 1 ][ j ] == $cell ) - { - j += $cell.colSpan; - continue; - } - $row.appendChild( $cell ); - if ( rowSpanAttr != 'rowSpan' ) + var mapRow = map[ j ], + row = new CKEDITOR.dom.element( table.$.rows[ j ] ), + cell = new CKEDITOR.dom.element( mapRow[ i ] ); + + if ( cell.$ ) { - $cell.rowSpan = $cell[ rowSpanAttr ]; - $cell.removeAttribute( rowSpanAttr ); + if ( cell.$.colSpan == 1 ) + cell.remove(); + // Reduce the col spans. + else + cell.$.colSpan -= 1; + + j += cell.$.rowSpan - 1; + + if ( !row.$.cells.length ) + rowsToDelete.push( row ); } - j += $cell.colSpan; - if ( $cell.colSpan == 1 ) - $cell.removeAttribute( 'colSpan' ); - if ( $cell.rowSpan == 1 ) - $cell.removeAttribute( 'rowSpan' ); } + } - if ( CKEDITOR.env.ie ) - $table.rows[ i ].replaceNode( $row ); - else + var firstRowCells = table.$.rows[ 0 ] && table.$.rows[ 0 ].cells; + + // Where to put the cursor after columns been deleted? + // 1. Into next cell of the first row if any; + // 2. Into previous cell of the first row if any; + // 3. Into table's parent element; + var cursorPosition = new CKEDITOR.dom.element( firstRowCells[ startColIndex ] || ( startColIndex ? firstRowCells[ startColIndex - 1 ] : table.$.parentNode ) ); + + // Delete table rows only if all columns are gone (do not remove empty row). + if ( rowsToDelete.length == rows ) + table.remove(); + + return cursorPosition; + } + + function getFocusElementAfterDelCols( cells ) + { + var cellIndexList = [], + table = cells[ 0 ] && cells[ 0 ].getAscendant( 'table' ), + i, length, + targetIndex, targetCell; + + // get the cellIndex list of delete cells + for ( i = 0, length = cells.length; i < length; i++ ) + cellIndexList.push( cells[i].$.cellIndex ); + + // get the focusable column index + cellIndexList.sort(); + for ( i = 1, length = cellIndexList.length; i < length; i++ ) + { + if ( cellIndexList[ i ] - cellIndexList[ i - 1 ] > 1 ) { - var dest = new CKEDITOR.dom.element( $table.rows[ i ] ); - var src = new CKEDITOR.dom.element( $row ); - dest.setHtml( '' ); - src.moveChildren( dest ); + targetIndex = cellIndexList[ i - 1 ] + 1; + break; } } - } - function clearRow( $tr ) - { - // Get the array of row's cells. - var $cells = $tr.cells; + if ( !targetIndex ) + targetIndex = cellIndexList[ 0 ] > 0 ? ( cellIndexList[ 0 ] - 1 ) + : ( cellIndexList[ cellIndexList.length - 1 ] + 1 ); - // Empty all cells. - for ( var i = 0 ; i < $cells.length ; i++ ) + // scan row by row to get the target cell + var rows = table.$.rows; + for ( i = 0, length = rows.length; i < length ; i++ ) { - $cells[ i ].innerHTML = ''; - - if ( !CKEDITOR.env.ie ) - ( new CKEDITOR.dom.element( $cells[ i ] ) ).appendBogus(); + targetCell = rows[ i ].cells[ targetIndex ]; + if ( targetCell ) + break; } + + return targetCell ? new CKEDITOR.dom.element( targetCell ) : table.getPrevious(); } - function insertRow( selection, insertBefore ) + function insertCell( selection, insertBefore ) { - // Get the row where the selection is placed in. - var row = selection.getStartElement().getAscendant( 'tr' ); - if ( !row ) - return; + var startElement = selection.getStartElement(); + var cell = startElement.getAscendant( 'td', 1 ) || startElement.getAscendant( 'th', 1 ); - // Create a clone of the row. - var newRow = row.clone( true ); + if ( !cell ) + return; - // Insert the new row before of it. - newRow.insertBefore( row ); + // Create the new cell element to be added. + var newCell = cell.clone(); + if ( !CKEDITOR.env.ie ) + newCell.appendBogus(); - // Clean one of the rows to produce the illusion of inserting an empty row - // before or after. - clearRow( insertBefore ? newRow.$ : row.$ ); + if ( insertBefore ) + newCell.insertBefore( cell ); + else + newCell.insertAfter( cell ); } - function deleteRows( selectionOrRow ) + function deleteCells( selectionOrCell ) { - if ( selectionOrRow instanceof CKEDITOR.dom.selection ) + if ( selectionOrCell instanceof CKEDITOR.dom.selection ) { - var cells = getSelectedCells( selectionOrRow ); - var rowsToDelete = []; + var cellsToDelete = getSelectedCells( selectionOrCell ); + var table = cellsToDelete[ 0 ] && cellsToDelete[ 0 ].getAscendant( 'table' ); + var cellToFocus = getFocusElementAfterDelCells( cellsToDelete ); - // Queue up the rows - it's possible and likely that we have duplicates. - for ( var i = 0 ; i < cells.length ; i++ ) - { - var row = cells[ i ].getParent(); - rowsToDelete[ row.$.rowIndex ] = row; - } + for ( var i = cellsToDelete.length - 1 ; i >= 0 ; i-- ) + deleteCells( cellsToDelete[ i ] ); - for ( i = rowsToDelete.length ; i >= 0 ; i-- ) - { - if ( rowsToDelete[ i ] ) - deleteRows( rowsToDelete[ i ] ); - } + if ( cellToFocus ) + placeCursorInCell( cellToFocus, true ); + else if ( table ) + table.remove(); } - else if ( selectionOrRow instanceof CKEDITOR.dom.element ) + else if ( selectionOrCell instanceof CKEDITOR.dom.element ) { - var table = selectionOrRow.getAscendant( 'table' ); - - if ( table.$.rows.length == 1 ) - table.remove(); + var tr = selectionOrCell.getParent(); + if ( tr.getChildCount() == 1 ) + tr.remove(); else - selectionOrRow.remove(); + selectionOrCell.remove(); } } - function insertColumn( selection, insertBefore ) + // Remove filler at end and empty spaces around the cell content. + function trimCell( cell ) { - // Get the cell where the selection is placed in. - var startElement = selection.getStartElement(); - var cell = startElement.getAscendant( 'td', true ) || startElement.getAscendant( 'th', true ); - - if ( !cell ) - return; - - // Get the cell's table. - var table = cell.getAscendant( 'table' ); - var cellIndex = cell.$.cellIndex; + var bogus = cell.getBogus(); + bogus && bogus.remove(); + cell.trim(); + } - // Loop through all rows available in the table. - for ( var i = 0 ; i < table.$.rows.length ; i++ ) + function placeCursorInCell( cell, placeAtEnd ) + { + var range = new CKEDITOR.dom.range( cell.getDocument() ); + if ( !range[ 'moveToElementEdit' + ( placeAtEnd ? 'End' : 'Start' ) ]( cell ) ) { - var $row = table.$.rows[ i ]; + range.selectNodeContents( cell ); + range.collapse( placeAtEnd ? false : true ); + } + range.select( true ); + } - // If the row doesn't have enough cells, ignore it. - if ( $row.cells.length < ( cellIndex + 1 ) ) - continue; + function cellInRow( tableMap, rowIndex, cell ) + { + var oRow = tableMap[ rowIndex ]; + if ( typeof cell == 'undefined' ) + return oRow; - cell = new CKEDITOR.dom.element( $row.cells[ cellIndex ].cloneNode( false ) ); + for ( var c = 0 ; oRow && c < oRow.length ; c++ ) + { + if ( cell.is && oRow[c] == cell.$ ) + return c; + else if ( c == cell ) + return new CKEDITOR.dom.element( oRow[ c ] ); + } + return cell.is ? -1 : null; + } - if ( !CKEDITOR.env.ie ) - cell.appendBogus(); + function cellInCol( tableMap, colIndex ) + { + var oCol = []; + for ( var r = 0; r < tableMap.length; r++ ) + { + var row = tableMap[ r ]; + oCol.push( row[ colIndex ] ); - // Get back the currently selected cell. - var baseCell = new CKEDITOR.dom.element( $row.cells[ cellIndex ] ); - if ( insertBefore ) - cell.insertBefore( baseCell ); - else - cell.insertAfter( baseCell ); + // Avoid adding duplicate cells. + if ( row[ colIndex ].rowSpan > 1 ) + r += row[ colIndex ].rowSpan - 1; } + return oCol; } - function deleteColumns( selectionOrCell ) + function mergeCells( selection, mergeDirection, isDetect ) { - if ( selectionOrCell instanceof CKEDITOR.dom.selection ) + var cells = getSelectedCells( selection ); + + // Invalid merge request if: + // 1. In batch mode despite that less than two selected. + // 2. In solo mode while not exactly only one selected. + // 3. Cells distributed in different table groups (e.g. from both thead and tbody). + var commonAncestor; + if ( ( mergeDirection ? cells.length != 1 : cells.length < 2 ) + || ( commonAncestor = selection.getCommonAncestor() ) + && commonAncestor.type == CKEDITOR.NODE_ELEMENT + && commonAncestor.is( 'table' ) ) + { + return false; + } + + var cell, + firstCell = cells[ 0 ], + table = firstCell.getAscendant( 'table' ), + map = CKEDITOR.tools.buildTableMap( table ), + mapHeight = map.length, + mapWidth = map[ 0 ].length, + startRow = firstCell.getParent().$.rowIndex, + startColumn = cellInRow( map, startRow, firstCell ); + + if ( mergeDirection ) { - var colsToDelete = getSelectedCells( selectionOrCell ); - for ( var i = colsToDelete.length ; i >= 0 ; i-- ) + var targetCell; + try { - if ( colsToDelete[ i ] ) - deleteColumns( colsToDelete[ i ] ); + var rowspan = parseInt( firstCell.getAttribute( 'rowspan' ), 10 ) || 1; + var colspan = parseInt( firstCell.getAttribute( 'colspan' ), 10 ) || 1; + + targetCell = + map[ mergeDirection == 'up' ? + ( startRow - rowspan ): + mergeDirection == 'down' ? ( startRow + rowspan ) : startRow ] [ + mergeDirection == 'left' ? + ( startColumn - colspan ): + mergeDirection == 'right' ? ( startColumn + colspan ) : startColumn ]; + } + catch( er ) + { + return false; + } + + // 1. No cell could be merged. + // 2. Same cell actually. + if ( !targetCell || firstCell.$ == targetCell ) + return false; + + // Sort in map order regardless of the DOM sequence. + cells[ ( mergeDirection == 'up' || mergeDirection == 'left' ) ? + 'unshift' : 'push' ]( new CKEDITOR.dom.element( targetCell ) ); } - else if ( selectionOrCell instanceof CKEDITOR.dom.element ) - { - // Get the cell's table. - var table = selectionOrCell.getAscendant( 'table' ); - // Get the cell index. - var cellIndex = selectionOrCell.$.cellIndex; + // Start from here are merging way ignorance (merge up/right, batch merge). + var doc = firstCell.getDocument(), + lastRowIndex = startRow, + totalRowSpan = 0, + totalColSpan = 0, + // Use a documentFragment as buffer when appending cell contents. + frag = !isDetect && new CKEDITOR.dom.documentFragment( doc ), + dimension = 0; - /* - * Loop through all rows from down to up, coz it's possible that some rows - * will be deleted. - */ - for ( i = table.$.rows.length - 1 ; i >= 0 ; i-- ) + for ( var i = 0; i < cells.length; i++ ) + { + cell = cells[ i ]; + + var tr = cell.getParent(), + cellFirstChild = cell.getFirst(), + colSpan = cell.$.colSpan, + rowSpan = cell.$.rowSpan, + rowIndex = tr.$.rowIndex, + colIndex = cellInRow( map, rowIndex, cell ); + + // Accumulated the actual places taken by all selected cells. + dimension += colSpan * rowSpan; + // Accumulated the maximum virtual spans from column and row. + totalColSpan = Math.max( totalColSpan, colIndex - startColumn + colSpan ) ; + totalRowSpan = Math.max( totalRowSpan, rowIndex - startRow + rowSpan ); + + if ( !isDetect ) { - // Get the row. - var row = new CKEDITOR.dom.element( table.$.rows[ i ] ); + // Trim all cell fillers and check to remove empty cells. + if ( trimCell( cell ), cell.getChildren().count() ) + { + // Merge vertically cells as two separated paragraphs. + if ( rowIndex != lastRowIndex + && cellFirstChild + && !( cellFirstChild.isBlockBoundary + && cellFirstChild.isBlockBoundary( { br : 1 } ) ) ) + { + var last = frag.getLast( CKEDITOR.dom.walker.whitespaces( true ) ); + if ( last && !( last.is && last.is( 'br' ) ) ) + frag.append( 'br' ); + } + + cell.moveChildren( frag ); + } + i ? cell.remove() : cell.setHtml( '' ); + } + lastRowIndex = rowIndex; + } - // If the cell to be removed is the first one and the row has just one cell. - if ( !cellIndex && row.$.cells.length == 1 ) + if ( !isDetect ) + { + frag.moveChildren( firstCell ); + + if ( !CKEDITOR.env.ie ) + firstCell.appendBogus(); + + if ( totalColSpan >= mapWidth ) + firstCell.removeAttribute( 'rowSpan' ); + else + firstCell.$.rowSpan = totalRowSpan; + + if ( totalRowSpan >= mapHeight ) + firstCell.removeAttribute( 'colSpan' ); + else + firstCell.$.colSpan = totalColSpan; + + // Swip empty left at the end of table due to the merging. + var trs = new CKEDITOR.dom.nodeList( table.$.rows ), + count = trs.count(); + + for ( i = count - 1; i >= 0; i-- ) + { + var tailTr = trs.getItem( i ); + if ( !tailTr.$.cells.length ) { - deleteRows( row ); + tailTr.remove(); + count++; continue; } - - // Else, just delete the cell. - if ( row.$.cells[ cellIndex ] ) - row.$.removeChild( row.$.cells[ cellIndex ] ); } + + return firstCell; } + // Be able to merge cells only if actual dimension of selected + // cells equals to the caculated rectangle. + else + return ( totalRowSpan * totalColSpan ) == dimension; } - function insertCell( selection, insertBefore ) + function verticalSplitCell ( selection, isDetect ) { - var startElement = selection.getStartElement(); - var cell = startElement.getAscendant( 'td', true ) || startElement.getAscendant( 'th', true ); + var cells = getSelectedCells( selection ); + if ( cells.length > 1 ) + return false; + else if ( isDetect ) + return true; + + var cell = cells[ 0 ], + tr = cell.getParent(), + table = tr.getAscendant( 'table' ), + map = CKEDITOR.tools.buildTableMap( table ), + rowIndex = tr.$.rowIndex, + colIndex = cellInRow( map, rowIndex, cell ), + rowSpan = cell.$.rowSpan, + newCell, + newRowSpan, + newCellRowSpan, + newRowIndex; + + if ( rowSpan > 1 ) + { + newRowSpan = Math.ceil( rowSpan / 2 ); + newCellRowSpan = Math.floor( rowSpan / 2 ); + newRowIndex = rowIndex + newRowSpan; + var newCellTr = new CKEDITOR.dom.element( table.$.rows[ newRowIndex ] ), + newCellRow = cellInRow( map, newRowIndex ), + candidateCell; - if ( !cell ) - return; + newCell = cell.clone(); + + // Figure out where to insert the new cell by checking the vitual row. + for ( var c = 0; c < newCellRow.length; c++ ) + { + candidateCell = newCellRow[ c ]; + // Catch first cell actually following the column. + if ( candidateCell.parentNode == newCellTr.$ + && c > colIndex ) + { + newCell.insertBefore( new CKEDITOR.dom.element( candidateCell ) ); + break; + } + else + candidateCell = null; + } + + // The destination row is empty, append at will. + if ( !candidateCell ) + newCellTr.append( newCell, true ); + } + else + { + newCellRowSpan = newRowSpan = 1; + + newCellTr = tr.clone(); + newCellTr.insertAfter( tr ); + newCellTr.append( newCell = cell.clone() ); + + var cellsInSameRow = cellInRow( map, rowIndex ); + for ( var i = 0; i < cellsInSameRow.length; i++ ) + cellsInSameRow[ i ].rowSpan++; + } - // Create the new cell element to be added. - var newCell = cell.clone(); if ( !CKEDITOR.env.ie ) newCell.appendBogus(); - if ( insertBefore ) - newCell.insertBefore( cell ); - else - newCell.insertAfter( cell ); + cell.$.rowSpan = newRowSpan; + newCell.$.rowSpan = newCellRowSpan; + if ( newRowSpan == 1 ) + cell.removeAttribute( 'rowSpan' ); + if ( newCellRowSpan == 1 ) + newCell.removeAttribute( 'rowSpan' ); + + return newCell; } - function deleteCells( selectionOrCell ) + function horizontalSplitCell( selection, isDetect ) { - if ( selectionOrCell instanceof CKEDITOR.dom.selection ) + var cells = getSelectedCells( selection ); + if ( cells.length > 1 ) + return false; + else if ( isDetect ) + return true; + + var cell = cells[ 0 ], + tr = cell.getParent(), + table = tr.getAscendant( 'table' ), + map = CKEDITOR.tools.buildTableMap( table ), + rowIndex = tr.$.rowIndex, + colIndex = cellInRow( map, rowIndex, cell ), + colSpan = cell.$.colSpan, + newCell, + newColSpan, + newCellColSpan; + + if ( colSpan > 1 ) { - var cellsToDelete = getSelectedCells( selectionOrCell ); - for ( var i = cellsToDelete.length - 1 ; i >= 0 ; i-- ) - deleteCells( cellsToDelete[ i ] ); + newColSpan = Math.ceil( colSpan / 2 ); + newCellColSpan = Math.floor( colSpan / 2 ); } - else if ( selectionOrCell instanceof CKEDITOR.dom.element ) + else { - if ( selectionOrCell.getParent().getChildCount() == 1 ) - selectionOrCell.getParent().remove(); - else - selectionOrCell.remove(); + newCellColSpan = newColSpan = 1; + var cellsInSameCol = cellInCol( map, colIndex ); + for ( var i = 0; i < cellsInSameCol.length; i++ ) + cellsInSameCol[ i ].colSpan++; } - } + newCell = cell.clone(); + newCell.insertAfter( cell ); + if ( !CKEDITOR.env.ie ) + newCell.appendBogus(); + cell.$.colSpan = newColSpan; + newCell.$.colSpan = newCellColSpan; + if ( newColSpan == 1 ) + cell.removeAttribute( 'colSpan' ); + if ( newCellColSpan == 1 ) + newCell.removeAttribute( 'colSpan' ); + + return newCell; + } // Context menu on table caption incorrect (#3834) var contextMenuTags = { thead : 1, tbody : 1, tfoot : 1, td : 1, tr : 1, th : 1 }; CKEDITOR.plugins.tabletools = { + requires : [ 'table', 'dialog' ], + init : function( editor ) { var lang = editor.lang.table; @@ -432,24 +787,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { exec : function( editor ) { - var selection = editor.getSelection(); - var startElement = selection && selection.getStartElement(); - var table = startElement && startElement.getAscendant( 'table', true ); + var selection = editor.getSelection(), + startElement = selection && selection.getStartElement(), + table = startElement && startElement.getAscendant( 'table', 1 ); if ( !table ) return; - // Maintain the selection point at where the table was deleted. - selection.selectElement( table ); - var range = selection.getRanges()[0]; - range.collapse(); - selection.selectRanges( [ range ] ); - - // If the table's parent has only one child, remove it as well. - if ( table.getParent().getChildCount() == 1 ) - table.getParent().remove(); - else - table.remove(); + // If the table's parent has only one child remove it as well (unless it's the body or a table cell) (#5416, #6289) + var parent = table.getParent(); + if ( parent.getChildCount() == 1 && !parent.is( 'body', 'td', 'th' ) ) + table = parent; + + var range = new CKEDITOR.dom.range( editor.document ); + range.moveToPosition( table, CKEDITOR.POSITION_BEFORE_START ); + table.remove(); + range.select(); } } ); @@ -458,7 +811,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license exec : function( editor ) { var selection = editor.getSelection(); - deleteRows( selection ); + placeCursorInCell( deleteRows( selection ) ); } } ); @@ -485,7 +838,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license exec : function( editor ) { var selection = editor.getSelection(); - deleteColumns( selection ); + var element = deleteColumns( selection ); + element && placeCursorInCell( element, true ); } } ); @@ -516,6 +870,46 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } } ); + editor.addCommand( 'cellMerge', + { + exec : function( editor ) + { + placeCursorInCell( mergeCells( editor.getSelection() ), true ); + } + } ); + + editor.addCommand( 'cellMergeRight', + { + exec : function( editor ) + { + placeCursorInCell( mergeCells( editor.getSelection(), 'right' ), true ); + } + } ); + + editor.addCommand( 'cellMergeDown', + { + exec : function( editor ) + { + placeCursorInCell( mergeCells( editor.getSelection(), 'down' ), true ); + } + } ); + + editor.addCommand( 'cellVerticalSplit', + { + exec : function( editor ) + { + placeCursorInCell( verticalSplitCell( editor.getSelection() ) ); + } + } ); + + editor.addCommand( 'cellHorizontalSplit', + { + exec : function( editor ) + { + placeCursorInCell( horizontalSplitCell( editor.getSelection() ) ); + } + } ); + editor.addCommand( 'cellInsertBefore', { exec : function( editor ) @@ -546,11 +940,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license order : 1, getItems : function() { - var cells = getSelectedCells( editor.getSelection() ); + var selection = editor.getSelection(), + cells = getSelectedCells( selection ); return { tablecell_insertBefore : CKEDITOR.TRISTATE_OFF, tablecell_insertAfter : CKEDITOR.TRISTATE_OFF, tablecell_delete : CKEDITOR.TRISTATE_OFF, + tablecell_merge : mergeCells( selection, null, true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_merge_right : mergeCells( selection, 'right', true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_merge_down : mergeCells( selection, 'down', true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_split_vertical : verticalSplitCell( selection, true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_split_horizontal : horizontalSplitCell( selection, true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, tablecell_properties : cells.length > 0 ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED }; } @@ -580,12 +980,52 @@ For licensing, see LICENSE.html or http://ckeditor.com/license order : 15 }, + tablecell_merge : + { + label : lang.cell.merge, + group : 'tablecell', + command : 'cellMerge', + order : 16 + }, + + tablecell_merge_right : + { + label : lang.cell.mergeRight, + group : 'tablecell', + command : 'cellMergeRight', + order : 17 + }, + + tablecell_merge_down : + { + label : lang.cell.mergeDown, + group : 'tablecell', + command : 'cellMergeDown', + order : 18 + }, + + tablecell_split_horizontal : + { + label : lang.cell.splitHorizontal, + group : 'tablecell', + command : 'cellHorizontalSplit', + order : 19 + }, + + tablecell_split_vertical : + { + label : lang.cell.splitVertical, + group : 'tablecell', + command : 'cellVerticalSplit', + order : 20 + }, + tablecell_properties : { label : lang.cell.title, group : 'tablecellproperties', command : 'cellProperties', - order : 20 + order : 21 }, tablerow : @@ -673,7 +1113,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { editor.contextMenu.addListener( function( element, selection ) { - if ( !element ) + if ( !element || element.isReadOnly() ) return null; while ( element ) @@ -699,3 +1139,52 @@ For licensing, see LICENSE.html or http://ckeditor.com/license }; CKEDITOR.plugins.add( 'tabletools', CKEDITOR.plugins.tabletools ); })(); + +/** + * Create a two-dimension array that reflects the actual layout of table cells, + * with cell spans, with mappings to the original td elements. + * @param table {CKEDITOR.dom.element} + */ +CKEDITOR.tools.buildTableMap = function ( table ) +{ + var aRows = table.$.rows ; + + // Row and Column counters. + var r = -1 ; + + var aMap = []; + + for ( var i = 0 ; i < aRows.length ; i++ ) + { + r++ ; + !aMap[r] && ( aMap[r] = [] ); + + var c = -1 ; + + for ( var j = 0 ; j < aRows[i].cells.length ; j++ ) + { + var oCell = aRows[i].cells[j] ; + + c++ ; + while ( aMap[r][c] ) + c++ ; + + var iColSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ; + var iRowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ; + + for ( var rs = 0 ; rs < iRowSpan ; rs++ ) + { + if ( !aMap[r + rs] ) + aMap[r + rs] = []; + + for ( var cs = 0 ; cs < iColSpan ; cs++ ) + { + aMap[r + rs][c + cs] = aRows[i].cells[j] ; + } + } + + c += iColSpan - 1 ; + } + } + return aMap ; +};