Skip to content

Commit b94d536

Browse files
committed
Merge branch 't/11159'
2 parents 0527b52 + 1fa061f commit b94d536

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ CKEditor 4 Changelog
77

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

10+
Fixed Issues:
11+
12+
* [#11159](http://dev.ckeditor.com/ticket/11159): [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions in IE9 and IE10.
13+
1014
## CKEditor 4.3
1115

1216
New Features:

plugins/image2/dialogs/image2.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
100100
// @param {Function} callback.
101101
return function( src, callback, scope ) {
102102
addListener( 'load', function() {
103-
callback.call( scope, image, image.$.width, image.$.height );
103+
// Don't use image.$.(width|height) since it's buggy in IE9-10 (#11159)
104+
var dimensions = getNatural( image );
105+
106+
callback.call( scope, image, dimensions.width, dimensions.height );
104107
} );
105108

106109
addListener( 'error', function() {

0 commit comments

Comments
 (0)