Skip to content
Permalink
Browse files

Merge branch 't/13386'

  • Loading branch information...
Reinmar committed Aug 6, 2015
2 parents 9c406a0 + a828f57 commit 52ebb3899f97dc1256a6b50cf8c6da7e31f637c8
Showing with 34 additions and 1 deletion.
  1. +4 −0 CHANGES.md
  2. +12 −1 core/editable.js
  3. +7 −0 tests/tickets/13386/1.html
  4. +11 −0 tests/tickets/13386/1.md
@@ -7,6 +7,10 @@ New Features:

* [#13501](http://dev.ckeditor.com/ticket/13501): Added [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting default filename for paste uploads.

Fixed Issues:

* [#13386](http://dev.ckeditor.com/ticket/13386): [Edge] Fixed: Issues with selecting and editing images.

## CKEditor 4.5.2

Fixed Issues:
@@ -1044,7 +1044,8 @@
CKEDITOR.env.ie && this.attachListener( this, 'click', blockInputClick );

// Gecko/Webkit need some help when selecting control type elements. (#3448)
if ( !CKEDITOR.env.ie ) {
// We apply same behavior for IE Edge. (#13386)
if ( !CKEDITOR.env.ie || CKEDITOR.env.edge ) {
this.attachListener( this, 'mousedown', function( ev ) {
var control = ev.data.getTarget();
// #11727. Note: htmlDP assures that input/textarea/select have contenteditable=false
@@ -1060,6 +1061,16 @@
} );
}

// For some reason, after click event is done, IE Edge loses focus on the selected element. (#13386)
if ( CKEDITOR.env.edge ) {
this.attachListener( this, 'mouseup', function( ev ) {
var selectedElement = ev.data.getTarget();
if ( selectedElement && selectedElement.is( 'img' ) ) {
editor.getSelection().selectElement( selectedElement );
}
} );
}

// Prevent right click from selecting an empty block even
// when selection is anchored inside it. (#5845)
if ( CKEDITOR.env.gecko ) {
@@ -0,0 +1,7 @@
<textarea id="editor1">
<p>Foo <img alt="Saturn V carrying Apollo 11" src="%BASE_PATH%_assets/logo.png" /> bar</p>
</textarea>

<script>
CKEDITOR.replace( 'editor1' );
</script>
@@ -0,0 +1,11 @@
@bender-ui: collapsed
@bender-tags: tc, 4.5.3, 13386
@bender-ckeditor-plugins: toolbar, wysiwygarea, image, contextmenu

1. Click the image. Image should be selected.
2. Click somewhere in the editor. Image should lose its focus.
3. Double click the image. Image popup should appear, filled with the clicked image data.
4. Click somewhere in the editor. Image should lose its focus.
5. Right click the image. Context menu for images should appear. The image edit option should be present there.
6. Click somewhere in the editor. Image should lose its focus.
7. Drag and drop the image.

0 comments on commit 52ebb38

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