diff --git a/CHANGES.md b/CHANGES.md index e6a2530eb1d..f1a523030f2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ CKEditor 4 Changelog Other Changes: +* [#13756](http://dev.ckeditor.com/ticket/13756): Fixed: Context menus are cut-off in Microsoft Edge. * [#12707](http://dev.ckeditor.com/ticket/12707): Fixed: The order of table elements does not meet the HTML specification. ## CKEditor 4.5.7 diff --git a/plugins/floatpanel/plugin.js b/plugins/floatpanel/plugin.js index 2d0234743ac..66fa3de6bb5 100644 --- a/plugins/floatpanel/plugin.js +++ b/plugins/floatpanel/plugin.js @@ -270,8 +270,8 @@ CKEDITOR.plugins.add( 'floatpanel', { target.removeStyle( 'width' ); if ( block.autoSize ) { - var panelDoc = block.element.getDocument(); - var width = ( CKEDITOR.env.webkit ? block.element : panelDoc.getBody() ).$.scrollWidth; + var panelDoc = block.element.getDocument(), + width = ( ( CKEDITOR.env.webkit || CKEDITOR.env.edge ) ? block.element : panelDoc.getBody() ).$.scrollWidth; // Account for extra height needed due to IE quirks box model bug: // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug diff --git a/tests/plugins/floatpanel/manual/rendering.html b/tests/plugins/floatpanel/manual/rendering.html new file mode 100644 index 00000000000..541976e812f --- /dev/null +++ b/tests/plugins/floatpanel/manual/rendering.html @@ -0,0 +1,12 @@ + + + + diff --git a/tests/plugins/floatpanel/manual/rendering.md b/tests/plugins/floatpanel/manual/rendering.md new file mode 100644 index 00000000000..7f2b5f8dde6 --- /dev/null +++ b/tests/plugins/floatpanel/manual/rendering.md @@ -0,0 +1,14 @@ +@bender-tags: tc, 4.5.8, 13756 +@bender-ui: collapsed +@bender-ckeditor-plugins: wysiwygarea,toolbar,elementspath,list,liststyle,basicstyles,contextmenu + +1. Open context menu inside any of list items (e.g. with a right mouse click). + +### Expected + +The panel layout is correct. + +### Unexpected + +Panel is cropped. +