Ticket #6568: 6568.patch

_source/plugins/tabletools/plugin.js

@@ -140 +140 @@
 
         function insertRow( selection, insertBefore )
         {
-                // Get the row where the selection is placed in.
-                var row = selection.getStartElement().getAscendant( 'tr' );
-                if ( !row )
-                        return;
+                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;
 
-                // Create a clone of the row.
-                var newRow = row.clone( 1 );
+                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; 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.$;
+                        }
+
+                        i += cell.colSpan - 1;
+                }
+
                 insertBefore ?
                         newRow.insertBefore( row ) :
                         newRow.insertAfter( row );
-
-                // Clean the new row.
-                clearRow( newRow.$ );
         }
 
         function deleteRows( selectionOrRow )
@@ -214 +242 @@
 
         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' ),
+                        lastCell = cells[ cells.length - 1 ],
+                        startCol = firstCell.$.cellIndex,
+                        lastCol = lastCell.$.cellIndex + lastCell.$.colSpan - 1,
+                        colIndex = insertBefore? startCol : lastCol;
 
-                if ( !cell )
-                        return;
 
-                // Get the cell's table.
-                var table = cell.getAscendant( 'table' );
-                var cellIndex = cell.$.cellIndex;
+                var map = CKEDITOR.tools.buildTableMap( table ),
+                        cloneCol = [],
+                        nextCol = [],
+                        height = map.length;
 
-                // Loop through all rows available in the table.
-                for ( var i = 0 ; i < table.$.rows.length ; i++ )
+                for ( var i = 0; i < height; i++ )
                 {
-                        var $row = table.$.rows[ i ];
+                        cloneCol.push( map[ i ][ colIndex ] );
+                        var nextCell = insertBefore ? map[ i ][ colIndex - 1 ] : map[ i ][ colIndex + 1 ];
+                        nextCell && nextCol.push( nextCell );
+                }
 
-                        // If the row doesn't have enough cells, ignore it.
-                        if ( $row.cells.length < ( cellIndex + 1 ) )
-                                continue;
-
-                        cell = ( new CKEDITOR.dom.element( $row.cells[ cellIndex ] ) ).clone( 0 );
-
-                        if ( !CKEDITOR.env.ie )
-                                cell.appendBogus();
-
-                        // Get back the currently selected cell.
-                        var baseCell = new CKEDITOR.dom.element( $row.cells[ cellIndex ] );
-                        if ( insertBefore )
-                                cell.insertBefore( baseCell );
+                for ( i = 0; i < height; 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.insertAfter( baseCell );
-                }
-        }
+                        {
+                                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;
+                }
+        }
 
         function getFocusElementAfterDelCols( cells )
         {