Skip to content
Permalink
Browse files

Merge branch 't/10055'

  • Loading branch information...
Reinmar committed Dec 3, 2013
2 parents 58b6b95 + b860484 commit a1baa1d3e28a70e97acc4a546d887131fbc6dd24
Showing with 9 additions and 5 deletions.
  1. +2 −0 CHANGES.md
  2. +7 −5 core/editable.js
@@ -17,6 +17,8 @@ Fixed Issues:
* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to `contents.css` so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline at BB-code mode.
* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing *Delete* key in a list item.
* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on selected image causes browser to go back.


## CKEditor 4.3

@@ -608,8 +608,12 @@
next,
rtl = keyCode == 8;

// Remove the entire list/table on fully selected content. (#7645)
if ( ( selected = getSelectedTableList( sel ) ) ) {
if (
// [IE<11] Remove selected image/anchor/etc here to avoid going back in history. (#10055)
( CKEDITOR.env.ie && CKEDITOR.env.version < 11 && ( selected = sel.getSelectedElement() ) ) ||
// Remove the entire list/table on fully selected content. (#7645)
( selected = getSelectedTableList( sel ) )
) {
// Make undo snapshot.
editor.fire( 'saveSnapshot' );

@@ -623,9 +627,7 @@
editor.fire( 'saveSnapshot' );

isHandled = 1;
}
else if ( range.collapsed )
{
} else if ( range.collapsed ) {
// Handle the following special cases: (#6217)
// 1. Del/Backspace key before/after table;
// 2. Backspace Key after start of table.

0 comments on commit a1baa1d

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