Ticket #5577: 5577_2.patch

_source/plugins/tabletools/plugin.js

@@ -86 +86 @@
                 return retval;
         }
 
-        function getFocusedCell( cellsToDelete ) {
+        function getFocusElementAfterDelCells( cellsToDelete ) {
                 var i = 0,
                         last = cellsToDelete.length - 1,
                         database = {},
@@ -247 +247 @@
                                 cell.insertAfter( baseCell );
                 }
         }
+        
+        function getFocusElementAfterDelCols( cells ) 
+        {
+                var cellIndex = [],
+                        cellIndexFilter = {},
+                        table = cells[ 0 ] && cells[ 0 ].getAscendant( 'table' ),
+                        i = 0,
+                        cell, targetCell, index, targetIndex, preIndex, len;
+                
+                // get a unrepeat cellIndex list
+                while ( cell = cells[ i++ ] )
+                {
+                        index = cell.$.cellIndex;
+                        
+                        if ( cellIndexFilter[ index ] )
+                                continue;
+                        
+                        cellIndex.push( index );
+                        cellIndexFilter[ index ] = 1;
+                }
 
+                cellIndex.sort();
+
+                preIndex = cellIndex[ 0 ];
+                for ( var i = 1, length = cellIndex.length; i < length; i++ )
+                {
+                        if ( cellIndex[ i ] - preIndex > 1 )
+                        {
+                                targetIndex = preIndex + 1;
+                                break;
+                        }
+                        preIndex = cellIndex[ i ];
+                }
+                
+                if ( !targetIndex )
+                        targetIndex = cellIndex[ 0 ] > 0 ? ( cellIndex[ 0 ] - 1 ) : ( cellIndex[ len - 1 ] + 1 );
+
+                // we scan row by row to get the target cell
+                var trs = table.$.getElementsByTagName( 'tr' );
+                for ( var i = 0, length = trs.length; i < length ; i++ )
+                {
+                        targetCell = trs[ i ].getElementsByTagName( 'td' )[ targetIndex ];
+                        if ( targetCell )
+                                break;
+                }
+
+                return targetCell ?  new CKEDITOR.dom.element( targetCell ) :  table.getPrevious();
+        }
+
         function deleteColumns( selectionOrCell )
         {
                 if ( selectionOrCell instanceof CKEDITOR.dom.selection )
                 {
-                        var colsToDelete = getSelectedCells( selectionOrCell );
-                        for ( var i = colsToDelete.length ; i >= 0 ; i-- )
+                        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;
 
                         // Get the cell index.
                         var cellIndex = selectionOrCell.$.cellIndex;
@@ -288 +342 @@
                                         row.$.removeChild( row.$.cells[ cellIndex ] );
                         }
                 }
+
+                return null;
         }
 
         function insertCell( selection, insertBefore )
@@ -315 +371 @@
                 {
                         var cellsToDelete = getSelectedCells( selectionOrCell );
                         var table = cellsToDelete[ 0 ] && cellsToDelete[ 0 ].getAscendant( 'table' );
-                        var cellToFocus   = getFocusedCell( cellsToDelete );
+                        var cellToFocus   = getFocusElementAfterDelCells( cellsToDelete );
 
                         for ( var i = cellsToDelete.length - 1 ; i >= 0 ; i-- )
                                 deleteCells( cellsToDelete[ i ] );
@@ -767 +823 @@
                                         exec : function( editor )
                                         {
                                                 var selection = editor.getSelection();
-                                                deleteColumns( selection );
+                                                var element = deleteColumns( selection );
+                                                element &&  placeCursorInCell( element, true );
                                         }
                                 } );