Ticket #4784: 4784_2.patch

_source/plugins/tabletools/plugin.js

@@ -85 +85 @@
 
                 return retval;
         }
+        
+        function getBesideFocusableCell( cell, cellsToDelete ) {
+                var focusedCell;
 
+                return (
+                                        ( focusedCell = cell.getPrevious() ) && 
+                                        indexOf( cellsToDelete, focusedCell ) == -1  &&
+                                        focusedCell
+                                ) 
+                                || 
+                                (
+                                        ( focusedCell = cell.getNext() )  &&
+                                        indexOf( cellsToDelete, focusedCell ) == -1  && 
+                                        focusedCell
+                                );
+                
+                function indexOf( cells, cell ) {
+                        for ( var i = 0, len = cells.length ; i < len ; i++ )
+                        {       
+                                if ( cells[i].$ == cell.$)
+                                        return i;
+                        }
+
+                        return -1;
+                }
+        }
+
+        function getToFocusedCell( cellsToDelete ) {
+                var i = 0,
+                        last = cellsToDelete.length - 1,
+                        cell,parentTr,tr;
+        
+                // 1.first we check left or right side focusable cell row by row;
+                while ( cell = cellsToDelete[ i++ ] )
+                {
+                        cell = getBesideFocusableCell( cell, cellsToDelete );
+                        if ( cell )
+                                return cell;
+                }
+                
+                // 2. then we check the toppest  row focusable cell
+                parentTr =  cellsToDelete[ 0 ].getParent();
+                if ( tr = parentTr.getPrevious() )
+                        return tr.getLast();
+                
+                // 3. last we check the lowerest  row focusable cell
+                parentTr = cellsToDelete[ last ].getParent();
+                if ( tr = parentTr.getNext() )
+                        return tr.getChild( 0 );
+
+                return null;
+        }
+
         function clearRow( $tr )
         {
                 // Get the array of row's cells.
@@ -277 +329 @@
                 if ( selectionOrCell instanceof CKEDITOR.dom.selection )
                 {
                         var cellsToDelete = getSelectedCells( selectionOrCell );
+                        var table = cellsToDelete[ 0 ] && cellsToDelete[ 0 ].getAscendant( 'table' );
+                        var cellToFocus   = getToFocusedCell( cellsToDelete );
+
                         for ( var i = cellsToDelete.length - 1 ; i >= 0 ; i-- )
                                 deleteCells( cellsToDelete[ i ] );
+                        
+                        if ( cellToFocus )
+                                placeCursorInCell( cellToFocus, true );
+                        else if ( table )
+                                table.remove();
                 }
                 else if ( selectionOrCell instanceof CKEDITOR.dom.element )
                 {
-                        if ( selectionOrCell.getParent().getChildCount() == 1 )
-                                selectionOrCell.getParent().remove();
+                        var tr = selectionOrCell.getParent();
+                        if ( tr.getChildCount() == 1 )
+                                tr.remove();
                         else
                                 selectionOrCell.remove();
                 }