Ticket #6649: 6649_2.patch

_source/plugins/selection/plugin.js

@@ -1061 +1061 @@
                                 return;
                         }
 
-                        if ( CKEDITOR.env.ie )
-                        {
-                                this.getNative().empty();
-
-                                try
-                                {
-                                        // Try to select the node as a control.
-                                        range = this.document.$.body.createControlRange();
-                                        range.addElement( element.$ );
-                                        range.select();
-                                }
-                                catch( e )
-                                {
-                                        // If failed, select it as a text range.
-                                        range = this.document.$.body.createTextRange();
-                                        range.moveToElementText( element.$ );
-                                        range.select();
-                                }
-                                finally
-                                {
-                                        this.document.fire( 'selectionchange' );
-                                }
+                        var range = new CKEDITOR.dom.range( element.getDocument() );
+                        range.setStartBefore( element );
+                        range.setEndAfter( element );
+                        range.select();
 
-                                this.reset();
-                        }
-                        else
-                        {
-                                // Create the range for the element.
-                                range = this.document.$.createRange();
-                                range.selectNode( element.$ );
+                        this.document.fire( 'selectionchange' );
+                        this.reset();
 
-                                // Select the range.
-                                var sel = this.getNative();
-                                sel.removeAllRanges();
-                                sel.addRange( range );
-
-                                this.reset();
-                        }
                 },
 
                 /**
@@ -1273 +1243 @@
                         // V2
                         function( forceExpand )
                         {
-                                var collapsed = this.collapsed;
-                                var isStartMarkerAlone;
-                                var dummySpan;
+                                var collapsed = this.collapsed,
+                                        isStartMarkerAlone, dummySpan, ieRange;
 
+                                // Try to make a object selection.
+                                var selected = this.getEnclosedNode();
+                                if ( selected )
+                                {
+                                        try
+                                        {
+                                                ieRange = this.document.$.body.createControlRange();
+                                                ieRange.addElement( selected.$ );
+                                                ieRange.select();
+                                                return;
+                                        }
+                                        catch( er ) {}
+                                }
+
                                 // IE doesn't support selecting the entire table row/cell, move the selection into cells, e.g.
                                 // <table><tbody><tr>[<td>cell</b></td>... => <table><tbody><tr><td>[cell</td>...
                                 if ( this.startContainer.type == CKEDITOR.NODE_ELEMENT && this.startContainer.getName() in nonCells
@@ -1295 +1278 @@
                                         endNode = bookmark.endNode;
 
                                 // Create the main range which will be used for the selection.
-                                var ieRange = this.document.$.body.createTextRange();
+                                ieRange = this.document.$.body.createTextRange();
 
                                 // Position the range at the start boundary.
                                 ieRange.moveToElementText( startNode.$ );

_source/plugins/tabletools/plugin.js

@@ -721 +721 @@
                                                 if ( !table )
                                                         return;
 
-                                                // Maintain the selection point at where the table was deleted.
-                                                selection.selectElement( table );
-                                                var range = selection.getRanges()[0];
-                                                range.collapse();
-                                                selection.selectRanges( [ range ] );
-
                                                 // If the table's parent has only one child remove it as well (unless it's the body or a table cell) (#5416, #6289)
                                                 var parent = table.getParent();
                                                 if ( parent.getChildCount() == 1 && !parent.is( 'body', 'td', 'th' ) )
-                                                        parent.remove();
-                                                else
-                                                        table.remove();
+                                                        table = parent;
+
+                                                var range = new CKEDITOR.dom.range( editor.document );
+                                                range.moveToPosition( table, CKEDITOR.POSITION_BEFORE_START );
+                                                table.remove();
+                                                range.select();
                                         }
                                 } );