Skip to content
Permalink
Browse files

Merge branch 't/12850'

  • Loading branch information...
Reinmar committed Jan 22, 2015
2 parents 3ca0e59 + 7ba8682 commit fb00b8a9a6fe8cdf0f28c6c0e64f3f8c42e8fc24
Showing with 3 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +2 −2 core/editable.js
@@ -15,6 +15,7 @@ Fixed Issues:
* [#10032](http://dev.ckeditor.com/ticket/10032): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter is executed for every paste after using the button.
* [#12597](http://dev.ckeditor.com/ticket/12597): [Blink/Webkit] Fixed: Multi-byte Japanese chars entry not working properly after *Shift+Enter*.
* [#12387](http://dev.ckeditor.com/ticket/12387): Fixed: An error is thrown if a skin does not have the [`chameleon`](http://docs.ckeditor.com/#!/api/CKEDITOR.skin-method-chameleon) property defined and [`config.uiColor`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uiColor) was defined.
* [#12850](http://dev.ckeditor.com/ticket/12850): [IEQM] Fixed: Error is thrown after focusing the editor.

## CKEditor 4.4.6

@@ -495,8 +495,8 @@
fixInitialSelection: function() {
var that = this;

// Deal with IE8- (the old MS selection) first.
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
// Deal with IE8- IEQM (the old MS selection) first.
if ( CKEDITOR.env.ie && ( CKEDITOR.env.version < 9 || CKEDITOR.env.quirks ) ) {
if ( this.hasFocus ) {
this.focus();
fixMSSelection();

0 comments on commit fb00b8a

Please sign in to comment.
You can’t perform that action at this time.