Ticket #5568: 5568.patch

_source/plugins/selection/plugin.js

@@ -1009 +1009 @@
 {
 var notWhitespaces = CKEDITOR.dom.walker.whitespaces( true );
 var fillerTextRegex = /\ufeff|\u00a0/;
+var nonCells = { table:1,tbody:1,tr:1 };
 
 CKEDITOR.dom.range.prototype.select =
         CKEDITOR.env.ie ?
@@ -1019 +1020 @@
                         var isStartMarkerAlone;
                         var dummySpan;
 
+                        // 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
+                                || this.endContainer.type == CKEDITOR.NODE_ELEMENT && this.endContainer.getName() in nonCells )
+                        {
+                                this.shrink( CKEDITOR.NODE_ELEMENT, true );
+                        }
+
                         var bookmark = this.createBookmark();
 
                         // Create marker tags for the start and end boundaries.

_source/core/dom/range.js

@@ -1240 +1240 @@
                  *  always anchor beside text nodes or innermost element.
                  * @param {Number} mode  ( CKEDITOR.SHRINK_ELEMENT | CKEDITOR.SHRINK_TEXT ) The shrinking mode.
                  */
-                shrink : function( mode )
+                shrink : function( mode, selectContents )
                 {
                         // Unable to shrink a collapsed range.
                         if ( !this.collapsed )
@@ -1315 +1315 @@
                                 if ( moveStart )
                                 {
                                         var textStart = walker[ mode == CKEDITOR.SHRINK_ELEMENT ? 'lastForward' : 'next']();
-                                        textStart && this.setStartBefore( textStart );
+                                        textStart && this.setStartAt( textStart, selectContents ? CKEDITOR.POSITION_AFTER_START : CKEDITOR.POSITION_BEFORE_START );
                                 }
 
                                 if ( moveEnd )
                                 {
                                         walker.reset();
                                         var textEnd = walker[ mode == CKEDITOR.SHRINK_ELEMENT ? 'lastBackward' : 'previous']();
-                                        textEnd && this.setEndAfter( textEnd );
+                                        textEnd && this.setEndAt( textEnd, selectContents ? CKEDITOR.POSITION_BEFORE_END : CKEDITOR.POSITION_AFTER_END );
                                 }
 
                                 return !!( moveStart || moveEnd );
@@ -1382 +1382 @@
                         // we will not need this check for our use of this class so we can
                         // ignore it for now.
 
+                        // Fixing invalid range start inside dtd empty elements.
+                        if( startNode.type == CKEDITOR.NODE_ELEMENT
+                                && CKEDITOR.dtd.$empty[ startNode.getName() ] )
+                                startNode = startNode.getParent(), startOffset = startNode.getIndex();
+                        
                         this.startContainer     = startNode;
                         this.startOffset        = startOffset;
 
@@ -1408 +1413 @@
                         // will not need this check for our use of this class so we can ignore
                         // it for now.
 
+                        // Fixing invalid range end inside dtd empty elements.
+                        if( endNode.type == CKEDITOR.NODE_ELEMENT 
+                                && CKEDITOR.dtd.$empty[ endNode.getName() ] )
+                                endNode = endNode.getParent(), endOffset = endNode.getIndex() + 1;
+
                         this.endContainer       = endNode;
                         this.endOffset          = endOffset;