Ticket #4784: 4784.patch

_source/plugins/tabletools/plugin.js

@@ -86 +86 @@
                 return retval;
         }
 
+        function getToFocusedCell( cellsToDelete ) {
+                var len = cellsToDelete.length,
+                        firstCell = cellsToDelete[ 0 ],
+                        lastCell  = cellsToDelete[ len - 1 ],
+                        td, tr;
+                
+                // Where to put the cursor after cells been deleted?
+                // 1. Into next cell  if any;
+                // 2. Into previous cell if any;
+                // 3. Into next row first cell if any;
+                // 4. Into previous row last cell if any;
+                
+                return ( lastCell.getNext() 
+                                || firstCell.getPrevious()           
+                                || ( tr = lastCell.getParent().getNext() ) && tr.getChild( 0 )
+                            || ( tr = firstCell.getParent().getPrevious() ) && tr.getLast()
+                           );
+
+        }
+
         function clearRow( $tr )
         {
                 // Get the array of row's cells.
@@ -277 +297 @@
                 if ( selectionOrCell instanceof CKEDITOR.dom.selection )
                 {
                         var cellsToDelete = getSelectedCells( selectionOrCell );
+                        var cellToFocus   = getToFocusedCell( cellsToDelete );
+
                         for ( var i = cellsToDelete.length - 1 ; i >= 0 ; i-- )
                                 deleteCells( cellsToDelete[ i ] );
+                        
+                        if ( cellToFocus )
+                        {
+                                placeCursorInCell( cellToFocus, true );
+                        }
+                        
                 }
                 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();
                 }