Skip to content

Commit 8eb1a58

Browse files
committed
Merge branch 't/10612b' into major
2 parents fd1a76e + c54e3d4 commit 8eb1a58

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CKEditor 4 Changelog
55

66
Fixed Issues:
77

8+
* [#10612](http://dev.ckeditor.com/ticket/10612): Internet Explorer 11 compatibility issues.
89
* [#10831](http://dev.ckeditor.com/ticket/10831): Image2: Merged `image2inline` and `image2block` into `image2` widget.
910

1011
## CKEditor 4.3 Beta

core/env.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if ( !CKEDITOR.env ) {
2828
*
2929
* @property {Boolean}
3030
*/
31-
ie: eval( '/*@cc_on!@*/false' ),
31+
ie: ( agent.indexOf( 'trident/' ) > -1 ),
3232
// Use eval to preserve conditional comment when compiling with Google Closure Compiler (#93).
3333

3434
/**
@@ -141,7 +141,7 @@ if ( !CKEDITOR.env ) {
141141
*
142142
* @property {Boolean}
143143
*/
144-
env.gecko = ( navigator.product == 'Gecko' && !env.webkit && !env.opera );
144+
env.gecko = ( navigator.product == 'Gecko' && !env.webkit && !env.opera && !env.ie );
145145

146146
/**
147147
* Indicates that CKEditor is running in Chrome.

core/scriptloader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ CKEDITOR.scriptLoader = (function() {
118118
src: url } );
119119

120120
if ( callback ) {
121-
if ( CKEDITOR.env.ie ) {
121+
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 11 ) {
122122
// FIXME: For IE, we are not able to return false on error (like 404).
123123
script.$.onreadystatechange = function() {
124124
if ( script.$.readyState == 'loaded' || script.$.readyState == 'complete' ) {

core/selection.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,8 @@
470470
// when editor has no focus, remember this scroll
471471
// position and revert it before context menu opens. (#5778)
472472
if ( evt.data.$.button == 2 ) {
473-
var sel = editor.document.$.selection;
474-
if ( sel.type == 'None' )
473+
var sel = editor.document.getSelection();
474+
if ( !sel || sel.getType() == CKEDITOR.SELECTION_NONE )
475475
scroll = editor.window.getScrollPosition();
476476
}
477477
});
@@ -552,7 +552,8 @@
552552
}
553553

554554
// It's much simpler for IE8+, we just need to reselect the reported range.
555-
if ( CKEDITOR.env.version > 7 ) {
555+
// This hack does not work on IE>=11 because there's no old selection&range APIs.
556+
if ( CKEDITOR.env.version > 7 && CKEDITOR.env.version < 11 ) {
556557
html.on( 'mousedown', function( evt ) {
557558
if ( evt.data.getTarget().is( 'html' ) ) {
558559
// Limit the text selection mouse move inside of editable. (#9715)

0 commit comments

Comments
 (0)