Index: /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js (revision 2685)
+++ /CKEditor/branches/prototype/_source/plugins/dialog/plugin.js (revision 2686)
@@ -564,5 +564,5 @@
CKEDITOR.dialog._.registerAccessKey( this, this, 'CTRL+' + contents.accessKey,
CKEDITOR.dialog._.tabAccessKeyDown, CKEDITOR.dialog._.tabAccessKeyUp );
- this._.accessKeyMap[ contents.accessKey ] = contents.id;
+ this._.accessKeyMap[ 'CTRL+' + contents.accessKey ] = contents.id;
}
},
Index: /CKEditor/branches/prototype/_source/plugins/dialogui/plugin.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/dialogui/plugin.js (revision 2685)
+++ /CKEditor/branches/prototype/_source/plugins/dialogui/plugin.js (revision 2686)
@@ -468,4 +468,15 @@
};
+ // IE BUG: Parent container does not resize to contain the iframe automatically.
+ if ( CKEDITOR.env.ie )
+ {
+ dialog.on( 'load', function()
+ {
+ var iframe = CKEDITOR.document.getById( _.frameId ),
+ contentDiv = iframe.getParent();
+ contentDiv.addClass( 'cke_dialog_ui_input_file' );
+ } );
+ }
+
CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML );
},
@@ -770,5 +781,5 @@
buttons = this._.buttons;
frameDocument.open();
- frameDocument.write( [ '',
+ frameDocument.write( [ '',
'