Ticket #7433: 7433.patch

_source/plugins/selection/plugin.js

@@ -677 +677 @@
                                                 range.collapse( start );
 
                                                 // Gets the element that encloses the range entirely.
-                                                var parent = range.parentElement();
+                                                var parent = range.parentElement(),
+                                                        doc = parent.ownerDocument;
 
                                                 // Empty parent element, e.g. <i>^</i>
                                                 if ( !parent.hasChildNodes() )
@@ -707 +708 @@
                                                         else if ( position < 0 )
                                                                 startIndex = index + 1;
                                                         else
-                                                                return { container : parent, offset : getNodeIndex( child ) };
-                                                }
+                                                        {
+                                                                // IE9 report wrong measurement when range anchors among line-break nodes.
+                                                                // e.g. <p>text<br />^<br /></p> (#7433)
+                                                                if ( CKEDITOR.env.ie9Compat && child.tagName == 'BR' )
+                                                                {
+                                                                        var bmId = 'cke_marker_hr';
+                                                                        range.execCommand( 'CreateBookmark', false, bmId );
+                                                                        child = doc.getElementsByName( bmId )[ 0 ];
+                                                                        var offset = getNodeIndex( child );
+                                                                        parent.removeChild( child );
+                                                                        return { container : parent, offset : offset };
+                                                                }
+                                                                else
+                                                                        return { container : parent, offset : getNodeIndex( child ) };
+                                                        }
+                                                }
 
                                                 // All childs are text nodes,
                                                 // or to the right hand of test range are all text nodes. (#6992)