Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 't/11077'
  • Loading branch information
oleq committed Nov 25, 2013
2 parents 0fab04e + f9b4c7c commit 9c3b8e4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -10,6 +10,7 @@ CKEditor 4 Changelog
Fixed Issues:

* [#11159](http://dev.ckeditor.com/ticket/11159): [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions in IE9 and IE10.
* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when inline widget is in a heading.
* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of inline widget.
* [#11182](http://dev.ckeditor.com/ticket/11182): [Internet Explorer 10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
Expand Down
12 changes: 6 additions & 6 deletions plugins/image2/plugin.js
Expand Up @@ -827,19 +827,19 @@
while ( ( l = listeners.pop() ) )
l.removeListener();

// Restore default cursor by removing special class.
editable.removeClass( cursorClass );

// This is to bring back the regular behaviour of the resizer.
resizer.removeClass( 'cke_image2_resizing' );

if ( updateData ) {
widget.setData( { width: newWidth, height: newHeight } );

// Save another undo snapshot: after resizing.
editor.fire( 'saveSnapshot' );
}

// Restore default cursor by removing special class.
editable.removeClass( cursorClass );

// This is to bring back the regular behaviour of the resizer.
resizer.removeClass( 'cke_image2_resizing' );

// Don't update data twice or more.
updateData = false;
}
Expand Down

0 comments on commit 9c3b8e4

Please sign in to comment.