Skip to content

Commit f79b703

Browse files
committed
Merge branch 't/13143'
2 parents 24b0f5d + 9baa138 commit f79b703

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Fixed Issues:
1919
* [#13420](http://dev.ckeditor.com/ticket/13420): Fixed: The [Auto Embed](http://ckeditor.com/addon/autoembed) plugin ignores encoded characters in URL parameters.
2020
* [#13184](http://dev.ckeditor.com/ticket/13184): Fixed: Web page reloaded after drop on editor UI.
2121
* [#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.
22+
* [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost while opening the panel.
2223

2324
## CKEditor 4.5.1
2425

plugins/floatpanel/plugin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/**
22
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
33
* For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
@@ -153,8 +153,8 @@ CKEDITOR.plugins.add( 'floatpanel', {
153153

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

0 commit comments

Comments
 (0)