Skip to content

Commit

Permalink
Merge branch 't/10910'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Sep 30, 2013
2 parents 2c044fd + 6ff1315 commit 691247d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -5,6 +5,7 @@ CKEditor 4 Changelog

Fixed Issues:

* [#10910](http://dev.ckeditor.com/ticket/10910): Fixed error thrown on Internet Explorer 9 in Compatibility Mode.
* [#10868](http://dev.ckeditor.com/ticket/10868): Prevent from Internet Explorer 8 crashing when applying a cite style.
* [#10915](http://dev.ckeditor.com/ticket/10915): CSS filter in Kama skin pull request.
* [#10914](http://dev.ckeditor.com/ticket/10914): Plugins indentlist and indentblock included into building config.
Expand Down
14 changes: 2 additions & 12 deletions core/selection.js
Expand Up @@ -964,18 +964,8 @@
endIndex = index - 1;
else if ( position < 0 )
startIndex = index + 1;
else {
// IE9 report wrong measurement with compareEndPoints when range anchors between two BRs.
// e.g. <p>text<br />^<br /></p> (#7433)
if ( CKEDITOR.env.ie9Compat && child.tagName == 'BR' ) {
// "Fall back" to w3c selection.
var sel = doc.defaultView.getSelection();
return {
container: sel[ start ? 'anchorNode' : 'focusNode' ],
offset: sel[ start ? 'anchorOffset' : 'focusOffset' ] };
} else
return { container: parent, offset: getNodeIndex( child ) };
}
else
return { container: parent, offset: getNodeIndex( child ) };
}

// All childs are text nodes,
Expand Down

0 comments on commit 691247d

Please sign in to comment.