Ticket #2486: 2486_1.patch

_whatsnew.html

@@ -62 +62 @@
                         now are shown properly.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using the Paste
                         dialogs in IE might insert the content at the start of the editor.</li>
+    <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2486">#2486</a>] Vertically splitting
+      cell with colspan > 1 breaks table layout.</li>                   
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/_source/internals/fcktablehandler.js

@@ -517 +517 @@
         var tableMap = this._CreateTableMap( currentCell ) ;
         var currentRowIndex = currentCell.parentNode.rowIndex ;
         var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentRowIndex, currentCell ) ;
+        // Save current cell colSpan
+        var currentColSpan = isNaN( currentCell.colSpan ) ? 1 : currentCell.colSpan ;   
         var currentRowSpan = currentCell.rowSpan ;
         if ( isNaN( currentRowSpan ) )
                 currentRowSpan = 1 ;
@@ -539 +541 @@
                         }
                 }
 
-                // 3. Insert the new cell to the indicated place, with the appropriate rowSpan, next row.
+                // 3. Insert the new cell to the indicated place, with the appropriate rowSpan and colSpan, next row.
                 var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ;
                 newCell.rowSpan = Math.floor( currentRowSpan / 2 ) ;
+                if ( currentColSpan > 1 )
+                        newCell.colSpan = currentColSpan ;
                 if ( FCKBrowserInfo.IsGeckoLike )
                         FCKTools.AppendBogusBr( newCell ) ;
                 currentCell.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ;
@@ -575 +579 @@
                         i += colSpan ;
                 }
 
-                // 3. Insert a new cell to new row.
+                // 3. Insert a new cell to new row. Set colSpan on the new cell.
                 var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ;
+                if ( currentColSpan > 1 )
+                        newCell.colSpan = currentColSpan ;              
                 if ( FCKBrowserInfo.IsGeckoLike )
                         FCKTools.AppendBogusBr( newCell ) ;
                 newRow.appendChild( newCell ) ;