Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 7495)
+++ /CKEditor/trunk/CHANGES.html (revision 7496)
@@ -47,4 +47,5 @@
#9015 : Applied ARIA label on dialog file input element.
#9016 : Applied the "presentation" role on the iframe element in dialog file field markup.
+ #8949 : Image Properties does not show in context menu when the image is wrapped in a div with the width set.
Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 7495)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 7496)
@@ -1113,4 +1113,13 @@
else if ( win )
{
+ var sel = editor.getSelection(),
+ ieSel = sel && sel.getNative();
+
+ // IE considers control-type element as separate
+ // focus host when selected, avoid destroying the
+ // selection in such case. (#5812) (#8949)
+ if ( ieSel && ieSel.type == 'Control' )
+ return;
+
// AIR needs a while to focus when moving from a link.
CKEDITOR.env.air ? setTimeout( function () { win.focus(); }, 0 ) : win.focus();