Skip to content
Permalink
Browse files

Merge branch 't/11253b'

  • Loading branch information...
oleq committed Feb 3, 2014
2 parents c96cd55 + 67185cf commit a3a30012f3ed76d2fe4bf9c4d0a418a47781aa9c
Showing with 4 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +2 −1 plugins/dialogui/plugin.js
  3. +1 −2 plugins/image2/dialogs/image2.js
@@ -7,6 +7,7 @@ Fixed Issues:

* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed issue with menubuttons panel showing in source mode.
* [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not cancelled anymore after editing has been triggered.
* [#11253](http://dev.ckeditor.com/ticket/11253): [IE] Fixed: Clipped upload button in [Enhanced Image](http://ckeditor.com/addon/image2) dialog.

## CKEditor 4.3.2

@@ -1302,7 +1302,8 @@ CKEDITOR.plugins.add( 'dialogui', {
'<label id="', _.labelId, '" for="', inputId, '" style="display:none">',
CKEDITOR.tools.htmlEncode( elementDefinition.label ),
'</label>',
'<input id="', inputId, '" aria-labelledby="', _.labelId, '" type="file" name="',
// Set width to make sure that input is not clipped by the iframe (#11253).
'<input style="width:100%" id="', inputId, '" aria-labelledby="', _.labelId, '" type="file" name="',
CKEDITOR.tools.htmlEncode( elementDefinition.id || 'cke_upload' ),
'" size="',
CKEDITOR.tools.htmlEncode( size > 0 ? size : "" ),
@@ -524,8 +524,7 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
type: 'file',
id: 'upload',
label: lang.btnUpload,
style: 'height:40px',
size: 38
style: 'height:40px'
},
{
type: 'fileButton',

0 comments on commit a3a3001

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