Skip to content

Commit

Permalink
Merge branch 't/10612b' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Oct 2, 2013
2 parents fd1a76e + c54e3d4 commit 8eb1a58
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -5,6 +5,7 @@ CKEditor 4 Changelog

Fixed Issues:

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

## CKEditor 4.3 Beta
Expand Down
4 changes: 2 additions & 2 deletions core/env.js
Expand Up @@ -28,7 +28,7 @@ if ( !CKEDITOR.env ) {
*
* @property {Boolean}
*/
ie: eval( '/*@cc_on!@*/false' ),
ie: ( agent.indexOf( 'trident/' ) > -1 ),
// Use eval to preserve conditional comment when compiling with Google Closure Compiler (#93).

/**
Expand Down Expand Up @@ -141,7 +141,7 @@ if ( !CKEDITOR.env ) {
*
* @property {Boolean}
*/
env.gecko = ( navigator.product == 'Gecko' && !env.webkit && !env.opera );
env.gecko = ( navigator.product == 'Gecko' && !env.webkit && !env.opera && !env.ie );

/**
* Indicates that CKEditor is running in Chrome.
Expand Down
2 changes: 1 addition & 1 deletion core/scriptloader.js
Expand Up @@ -118,7 +118,7 @@ CKEDITOR.scriptLoader = (function() {
src: url } );

if ( callback ) {
if ( CKEDITOR.env.ie ) {
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 11 ) {
// FIXME: For IE, we are not able to return false on error (like 404).
script.$.onreadystatechange = function() {
if ( script.$.readyState == 'loaded' || script.$.readyState == 'complete' ) {
Expand Down
7 changes: 4 additions & 3 deletions core/selection.js
Expand Up @@ -470,8 +470,8 @@
// when editor has no focus, remember this scroll
// position and revert it before context menu opens. (#5778)
if ( evt.data.$.button == 2 ) {
var sel = editor.document.$.selection;
if ( sel.type == 'None' )
var sel = editor.document.getSelection();
if ( !sel || sel.getType() == CKEDITOR.SELECTION_NONE )
scroll = editor.window.getScrollPosition();
}
});
Expand Down Expand Up @@ -552,7 +552,8 @@
}

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

0 comments on commit 8eb1a58

Please sign in to comment.