Ticket #5850: 5850_2.patch

_source/plugins/selection/plugin.js

@@ -663 +663 @@
                                                         boundaryInfo = getBoundaryInformation( nativeRange );
                                                         range.setEnd( new CKEDITOR.dom.node( boundaryInfo.container ), boundaryInfo.offset );
 
+                                                        // Correct an invalid IE range case on empty list item. (#5850)
+                                                        if ( range.endContainer.getPosition( range.startContainer ) & CKEDITOR.POSITION_PRECEDING
+                                                                        && range.endOffset <= range.startContainer.getIndex() )
+                                                        {
+                                                                range.collapse();
+                                                        }
+
                                                         return [ range ];
                                                 }
                                                 else if ( type == CKEDITOR.SELECTION_ELEMENT )
@@ -878 +885 @@
                                                         node = node.getChild( range.startOffset );
 
                                                         if ( !node || node.type != CKEDITOR.NODE_ELEMENT )
-                                                                return range.startContainer;
+                                                                node = range.startContainer;
 
                                                         var child = node.getFirst();
                                                         while (  child && child.type == CKEDITOR.NODE_ELEMENT )
@@ -886 +893 @@
                                                                 node = child;
                                                                 child = child.getFirst();
                                                         }
-
-                                                        return node;
                                                 }
-                                        }
-
-                                        if ( CKEDITOR.env.ie )
-                                        {
-                                                range = sel.createRange();
-                                                range.collapse( 1 );
-
-                                                node = range.parentElement();
-                                        }
-                                        else
-                                        {
-                                                node = sel.anchorNode;
+                                                else
+                                                {
+                                                        node = range.startContainer;
+                                                        if ( node.type != CKEDITOR.NODE_ELEMENT )
+                                                                node = node.getParent();
+                                                }
 
-                                                if ( node && node.nodeType != 1 )
-                                                        node = node.parentNode;
+                                                node = node.$;
                                         }
                         }