Skip to content

Commit

Permalink
Merge branch 't/13756'
Browse files Browse the repository at this point in the history
  • Loading branch information
mlewand committed Mar 14, 2016
2 parents 02f0ffb + 64b9f6e commit 7cd36b9
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/floatpanel/plugin.js
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions tests/plugins/floatpanel/manual/rendering.html
@@ -0,0 +1,12 @@

<textarea cols="80" id="editor1" name="editor1" rows="10">
<ul>
<li>foo</li>
<li>bar</li>
<li>baz</li>
</ul>
</textarea>

<script>
CKEDITOR.replace( 'editor1' );
</script>
14 changes: 14 additions & 0 deletions 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.

0 comments on commit 7cd36b9

Please sign in to comment.