Skip to content

Commit

Permalink
Merge branch 't/11159'
Browse files Browse the repository at this point in the history
  • Loading branch information
oleq committed Nov 22, 2013
2 parents 0527b52 + 1fa061f commit b94d536
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGES.md
Expand Up @@ -7,6 +7,10 @@ CKEditor 4 Changelog

* To match the naming convention `image2` and `language` buttons are now `Image2` and `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).

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.

## CKEditor 4.3

New Features:
Expand Down
5 changes: 4 additions & 1 deletion plugins/image2/dialogs/image2.js
Expand Up @@ -100,7 +100,10 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
// @param {Function} callback.
return function( src, callback, scope ) {
addListener( 'load', function() {
callback.call( scope, image, image.$.width, image.$.height );
// Don't use image.$.(width|height) since it's buggy in IE9-10 (#11159)
var dimensions = getNatural( image );

callback.call( scope, image, dimensions.width, dimensions.height );
} );

addListener( 'error', function() {
Expand Down

0 comments on commit b94d536

Please sign in to comment.