Skip to content

Commit

Permalink
Merge branch 't/16845' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Comandeer committed Mar 9, 2017
2 parents 96bbe7e + 974084d commit a4e9eef
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -29,6 +29,7 @@ Fixed Issues:
* [#14769](https://dev.ckeditor.com/ticket/14769): Fixed: URLs with '-' in host are not detected by [Autolink](http://ckeditor.com/addon/autolink) plugin.
* [#16804](https://dev.ckeditor.com/ticket/16804): Fixed: Focus is not on the first menu item when user opens [Context Menu](http://ckeditor.com/addon/contextmenu) or combobox from editor's toolbar.
* [#14407](https://dev.ckeditor.com/ticket/14407): [IE] Fixed: Non-editable widgets can be edited.
* [#16845](https://dev.ckeditor.com/ticket/16845): [IE] Fixed: Cursor jumps to the top of the scrolled editor after focusing it when [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin is enabled.

## CKEditor 4.6.2

Expand Down
1 change: 1 addition & 0 deletions plugins/copyformatting/plugin.js
Expand Up @@ -424,6 +424,7 @@
},

applyFormatting: {
editorFocus: false,
exec: function( editor, data ) {
var cmd = editor.getCommand( 'copyFormatting' ),
isFromKeystroke = data ? data.from == 'keystrokeHandler' : false,
Expand Down
45 changes: 45 additions & 0 deletions tests/plugins/copyformatting/manual/iefocus.html
@@ -0,0 +1,45 @@

<textarea name="editor1" id="editor1" cols="30" rows="10">
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p><img alt="" src="http://s1.ckeditor.com/themes/ckeditor4/images/slider-cke46-ea0c506c78.png" style="height:63px; width:200px" /></p>
<p><img alt="cake" src="http://c.cksource.com/a/1/img/demo/brownie.jpg" style="height:133px; width:200px" /></p>

<p>&nbsp;</p>

<div style="float:right; padding:5px; width:210px"><a href="http://ckeditor.com/"><img alt="Focus jumps to the top of the editor" src="http://c.cksource.com/a/1/img/demo/brownie.jpg" style="height:133px; width:200px" /></a></div>

<p>&nbsp;</p>

<p>&nbsp;</p>
</textarea>

<script>
if ( !CKEDITOR.env.ie ) {
bender.ignore();
}

CKEDITOR.replace( 'editor1' );
</script>
16 changes: 16 additions & 0 deletions tests/plugins/copyformatting/manual/iefocus.md
@@ -0,0 +1,16 @@
@bender-tags: tc, 4.7.0, 16845, copyformatting
@bender-ui: collapsed
@bender-ckeditor-plugins: copyformatting,toolbar,wysiwygarea,floatingspace,elementspath,image2,widget,justify,div

## Test Scenario

1. Make sure the editor is not focused and scroll it down.
2. Select the image on the right by clicking it.

## Expected

Image is selected.

## Unexpected

The editor scrolls to the top.

0 comments on commit a4e9eef

Please sign in to comment.