Skip to content
Permalink
Browse files

Merge branch 't/13143'

  • Loading branch information...
oleq committed Jul 20, 2015
2 parents 24b0f5d + 9baa138 commit f79b70383cde56c3deebdb01886f4693b35923fb
Showing with 4 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +3 −3 plugins/floatpanel/plugin.js
@@ -19,6 +19,7 @@ Fixed Issues:
* [#13420](http://dev.ckeditor.com/ticket/13420): Fixed: The [Auto Embed](http://ckeditor.com/addon/autoembed) plugin ignores encoded characters in URL parameters.
* [#13184](http://dev.ckeditor.com/ticket/13184): Fixed: Web page reloaded after drop on editor UI.
* [#13410](http://dev.ckeditor.com/ticket/13410): Fixed: Error thrown in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin when undoing right after pasting a link.
* [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost while opening the panel.

## CKEditor 4.5.1

@@ -1,4 +1,4 @@
/**
/**
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
@@ -153,8 +153,8 @@ CKEDITOR.plugins.add( 'floatpanel', {

var element = this.element,
iframe = this._.iframe,
// Non IE prefer the event into a window object.
focused = CKEDITOR.env.ie ? iframe : new CKEDITOR.dom.window( iframe.$.contentWindow ),
// Edge prefers iframe's window to the iframe, just like the rest of the browsers (#13143).
focused = CKEDITOR.env.ie && !CKEDITOR.env.edge ? iframe : new CKEDITOR.dom.window( iframe.$.contentWindow ),
doc = element.getDocument(),
positionedAncestor = this._.parentElement.getPositionedAncestor(),
position = offsetParent.getDocumentPosition( doc ),

0 comments on commit f79b703

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