Skip to content
Permalink
Browse files

Merge branch 't/9654'

  • Loading branch information...
pjasiun committed Aug 27, 2013
2 parents 402f68f + f587e5c commit 0fb7afe801d0889e8638c3da995bc572096ce842
Showing with 3 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +2 −2 core/env.js
@@ -3,6 +3,7 @@ CKEditor 4 Changelog

## CKEditor 4.2.1

* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with IE10 Quirks mode.
* [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.
* [#10646](http://dev.ckeditor.com/ticket/10646): Removing selected sub-list or nested table with *Backspace/Delete* removes parent element.

@@ -181,11 +181,11 @@ if ( !CKEDITOR.env ) {
env.ie9Compat = version == 9;
env.ie8Compat = version == 8;
env.ie7Compat = version == 7;
env.ie6Compat = version < 7 || env.quirks;
env.ie6Compat = version < 7 || ( env.quirks && version < 10 );

/**
* Indicates that CKEditor is running in an IE6-like environment, which
* includes IE6 itself as well as IE7 and IE8 in Quirks Mode.
* includes IE6 itself as well as IE7, IE8 and IE9 in Quirks Mode.
*
* @deprecated
* @property {Boolean} ie6Compat

0 comments on commit 0fb7afe

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