Ticket #6568: 6568_3.patch

_source/plugins/tabletools/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, 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 )
@@ -123 +115 @@
                 return null;
         }
 
-        function clearRow( $tr )
+        function insertRow( selection, insertBefore )
         {
-                // Get the array of row's cells.
-                var $cells = $tr.cells;
+                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;
 
-                // Empty all cells.
-                for ( var i = 0 ; i < $cells.length ; i++ )
-                {
-                        $cells[ i ].innerHTML = '';
+                var map = CKEDITOR.tools.buildTableMap( table ),
+                                cloneRow = map[ rowIndex ],
+                                nextRow = insertBefore ? map[ rowIndex - 1 ] : map[ rowIndex + 1 ],
+                                width = map[0].length;
 
-                        if ( !CKEDITOR.env.ie )
-                                ( new CKEDITOR.dom.element( $cells[ i ] ) ).appendBogus();
-                }
-        }
+                var newRow = doc.createElement( 'tr' );
+                for ( var i = 0; 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 ] )
+                        {
+                                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.$;
+                        }
 
-        function insertRow( selection, insertBefore )
-        {
-                // Get the row where the selection is placed in.
-                var row = selection.getStartElement().getAscendant( 'tr' );
-                if ( !row )
-                        return;
+                        i += cell.colSpan - 1;
+                }
 
-                // Create a clone of the row.
-                var newRow = row.clone( 1 );
-
                 insertBefore ?
-                        newRow.insertBefore( row ) :
-                        newRow.insertAfter( row );
-
-                // Clean the new row.
-                clearRow( newRow.$ );
+                newRow.insertBefore( row ) :
+                newRow.insertAfter( row );
         }
 
         function deleteRows( selectionOrRow )
@@ -161 +166 @@
                 if ( selectionOrRow instanceof CKEDITOR.dom.selection )
                 {
                         var cells = getSelectedCells( selectionOrRow ),
-                                cellsCount = cells.length,
-                                rowsToDelete = [],
-                                cursorPosition,
-                                previousRowIndex,
-                                nextRowIndex;
+                                        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 = [];
 
-                        // Queue up the rows - it's possible and likely that we have duplicates.
-                        for ( var i = 0 ; i < cellsCount ; i++ )
+                        // Delete cell or reduce cell spans by checking through the table map.
+                        for ( var i = startRowIndex; i <= endRowIndex; i++ )
                         {
-                                var row = cells[ i ].getParent(),
-                                                rowIndex = row.$.rowIndex;
+                                var mapRow = map[ i ],
+                                                row = new CKEDITOR.dom.element( table.$.rows[ i ] );
 
-                                !i && ( previousRowIndex = rowIndex - 1 );
-                                rowsToDelete[ rowIndex ] = row;
-                                i == cellsCount - 1 && ( nextRowIndex = rowIndex + 1 );
-                        }
+                                for ( var j = 0; j < mapRow.length; j++ )
+                                {
+                                        var cell = new CKEDITOR.dom.element( mapRow[ j ] ),
+                                                        cellRowIndex = cell.getParent().$.rowIndex;
+
+                                        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 );
+                                                }
+                                        }
 
-                        var table = row.getAscendant( 'table' ),
-                                        rows =  table.$.rows,
-                                        rowCount = rows.length;
+                                        j += cell.$.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.
-                        cursorPosition = new CKEDITOR.dom.element(
-                                nextRowIndex < rowCount && table.$.rows[ nextRowIndex ] ||
-                                previousRowIndex > 0 && table.$.rows[ previousRowIndex ] ||
-                                table.$.parentNode );
+                        var cursorPosition =  new CKEDITOR.dom.element( rows[ startRowIndex ] || rows[ startRowIndex - 1 ] || table.$.parentNode );
 
                         for ( i = rowsToDelete.length ; i >= 0 ; i-- )
-                        {
-                                if ( rowsToDelete[ i ] )
-                                        deleteRows( rowsToDelete[ i ] );
-                        }
+                                deleteRows( rowsToDelete[ i ] );
 
                         return cursorPosition;
                 }
@@ -208 +231 @@
                         else
                                 selectionOrRow.remove();
                 }
+        }
 
-                return 0;
-        }
+        function getCellColIndex( cell, isStart )
+        {
+                var row = cell.getParent(),
+                        rowCells = row.$.cells;
+
+                var colIndex = 0;
+                for ( var i = 0; i < rowCells.length; i++ )
+                {
+                        var mapCell = rowCells[ i ];
+                        colIndex += isStart ? 1 : mapCell.colSpan;
+                        if ( mapCell == cell.$ )
+                                break;
+                }
 
+                return colIndex -1;
+        }
+
+        function getColumnsIndices( cells, isStart )
+        {
+                var retval = isStart ? Infinity : 0;
+                for ( var i = 0; i < cells.length; i++ )
+                {
+                        var colIndex = getCellColIndex( cells[ i ], isStart );
+                        if ( isStart ? colIndex < retval  : colIndex > retval )
+                                retval = colIndex;
+                }
+                return retval;
+        }
+
         function insertColumn( selection, insertBefore )
         {
-                // Get the cell where the selection is placed in.
-                var startElement = selection.getStartElement();
-                var cell = startElement.getAscendant( 'td', 1 ) || startElement.getAscendant( 'th', 1 );
+                var cells = getSelectedCells( selection ),
+                        firstCell = cells[ 0 ],
+                        table = firstCell.getAscendant( 'table' ),
+                        startCol =  getColumnsIndices( cells, 1 ),
+                        lastCol =  getColumnsIndices( cells ),
+                        colIndex = insertBefore? startCol : lastCol;
 
-                if ( !cell )
-                        return;
+                var map = CKEDITOR.tools.buildTableMap( table ),
+                        cloneCol = [],
+                        nextCol = [],
+                        height = map.length;
 
-                // Get the cell's table.
-                var table = cell.getAscendant( 'table' );
-                var cellIndex = cell.$.cellIndex;
+                for ( var i = 0; i < height; i++ )
+                {
+                        cloneCol.push( map[ i ][ colIndex ] );
+                        var nextCell = insertBefore ? map[ i ][ colIndex - 1 ] : map[ i ][ colIndex + 1 ];
+                        nextCell && nextCol.push( nextCell );
+                }
 
-                // Loop through all rows available in the table.
-                for ( var i = 0 ; i < table.$.rows.length ; i++ )
+                for ( i = 0; i < height; i++ )
                 {
-                        var $row = table.$.rows[ i ];
+                        var cell;
+                        // Check whether there's a spanning column here, do not break it.
+                        if ( cloneCol[ i ].colSpan > 1
+                                && nextCol.length
+                                && nextCol[ i ] == cloneCol[ i ] )
+                        {
+                                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.$;
+                        }
 
-                        // If the row doesn't have enough cells, ignore it.
-                        if ( $row.cells.length < ( cellIndex + 1 ) )
-                                continue;
+                        i += cell.rowSpan - 1;
+                }
+        }
 
-                        cell = ( new CKEDITOR.dom.element( $row.cells[ cellIndex ] ) ).clone( 0 );
+        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 = [];
 
-                        if ( !CKEDITOR.env.ie )
-                                cell.appendBogus();
+                // Figure out selected cells' column indices.
+                for ( var i = 0, rows = map.length; i < rows; i++ )
+                {
+                        for ( var j = 0, cols = map[ i ].length; j < cols; j++ )
+                        {
+                                if ( map[ i ][ j ] == firstCell.$ )
+                                        startColIndex = j;
+                                if ( map[ i ][ j ] == lastCell.$ )
+                                        endColIndex = j;
+                        }
+                }
 
-                        // Get back the currently selected cell.
-                        var baseCell = new CKEDITOR.dom.element( $row.cells[ cellIndex ] );
-                        if ( insertBefore )
-                                cell.insertBefore( baseCell );
-                        else
-                                cell.insertAfter( baseCell );
-                }
-        }
+                // Delete cell or reduce cell spans by checking through the table map.
+                for ( i = startColIndex; i <= endColIndex; i++ )
+                {
+                        for ( j = 0; j < map.length; j++ )
+                        {
+                                var mapRow = map[ j ],
+                                        row = new CKEDITOR.dom.element( table.$.rows[ j ] ),
+                                        cell = new CKEDITOR.dom.element( mapRow[ i ] );
+
+                                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 );
+                        }
+                }
 
+                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 = [],
@@ -286 +405 @@
                 return targetCell ?  new CKEDITOR.dom.element( targetCell ) :  table.getPrevious();
         }
 
-        function deleteColumns( selectionOrCell )
-        {
-                if ( selectionOrCell instanceof CKEDITOR.dom.selection )
-                {
-                        var colsToDelete = getSelectedCells( selectionOrCell ),
-                                elementToFocus = getFocusElementAfterDelCols( colsToDelete );
-
-                        for ( var i = colsToDelete.length - 1 ; i >= 0 ; i-- )
-                        {
-                                if ( colsToDelete[ i ] )
-                                        deleteColumns( colsToDelete[ i ] );
-                        }
-
-                        return elementToFocus;
-                }
-                else if ( selectionOrCell instanceof CKEDITOR.dom.element )
-                {
-                        // Get the cell's table.
-                        var table = selectionOrCell.getAscendant( 'table' );
-                        if ( !table )
-                                return null;
-
-                        // Get the cell index.
-                        var cellIndex = selectionOrCell.$.cellIndex;
-
-                        /*
-                         * 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-- )
-                        {
-                                // Get the row.
-                                var row = new CKEDITOR.dom.element( table.$.rows[ i ] );
-
-                                // If the cell to be removed is the first one and the row has just one cell.
-                                if ( !cellIndex && row.$.cells.length == 1 )
-                                {
-                                        deleteRows( row );
-                                        continue;
-                                }
-
-                                // Else, just delete the cell.
-                                if ( row.$.cells[ cellIndex ] )
-                                        row.$.removeChild( row.$.cells[ cellIndex ] );
-                        }
-                }
-
-                return null;
-        }
-
         function insertCell( selection, insertBefore )
         {
                 var startElement = selection.getStartElement();