Ticket #5577: 5577.patch

_source/plugins/tabletools/plugin.js

@@ -252 +252 @@
         {
                 if ( selectionOrCell instanceof CKEDITOR.dom.selection )
                 {
-                        var colsToDelete = getSelectedCells( selectionOrCell );
-                        for ( var i = colsToDelete.length ; i >= 0 ; i-- )
+                        var colsToDelete = getSelectedCells( selectionOrCell ),
+                                table = colsToDelete[ 0 ] && colsToDelete[ 0 ].getAscendant( 'table' ),
+                                parent = table && table.$.parentNode,
+                                cursorPosition = null;
+
+                        for ( var i = colsToDelete.length - 1 ; i >= 0 ; i-- )
                         {
                                 if ( colsToDelete[ i ] )
                                         deleteColumns( colsToDelete[ i ] );
                         }
+
+                        if ( table && table.$.parentNode )
+                                cursorPosition = new CKEDITOR.dom.element( 
+                                                                                table.$.getElementsByTagName( 'td' )[ 0 ] 
+                                                                                || parent
+                                                                        );
+                        else
+                                cursorPosition = new CKEDITOR.dom.element( parent );
+
+                        return cursorPosition;
                 }
                 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 +304 @@
                                         row.$.removeChild( row.$.cells[ cellIndex ] );
                         }
                 }
+
+                return null;
         }
 
         function insertCell( selection, insertBefore )
@@ -767 +785 @@
                                         exec : function( editor )
                                         {
                                                 var selection = editor.getSelection();
-                                                deleteColumns( selection );
+                                                var cell = deleteColumns( selection );
+                                                cell && placeCursorInCell( cell, true );
                                         }
                                 } );