Ticket #3642: 3642_2.patch
File 3642_2.patch, 2.6 KB (added by , 14 years ago) |
---|
-
_source/plugins/dialogui/plugin.js
1243 1243 if ( CKEDITOR.env.isCustomDomain() ) 1244 1244 frameDocument.$.domain = document.domain; 1245 1245 1246 var size = ''; 1247 if ( elementDefinition.size ) 1248 size = elementDefinition.size - ( CKEDITOR.env.ie ? 7 : 0 ); // "Browse" button is bigger in IE. 1249 1246 1250 frameDocument.$.write( [ '<html><head><title></title></head><body style="margin: 0; overflow: hidden; background: transparent;">', 1247 1251 '<form enctype="multipart/form-data" method="POST" action="', 1248 1252 CKEDITOR.tools.htmlEncode( elementDefinition.action ), … … 1250 1254 '<input type="file" name="', 1251 1255 CKEDITOR.tools.htmlEncode( elementDefinition.id || 'cke_upload' ), 1252 1256 '" size="', 1253 CKEDITOR.tools.htmlEncode( elementDefinition.size || ''),1257 CKEDITOR.tools.htmlEncode( size > 0 ? size : "" ), 1254 1258 '" />', 1255 1259 '</form>', 1256 1260 '</body></html>' ].join( '' ) ); -
_source/plugins/image/dialogs/image.js
972 972 type : 'file', 973 973 id : 'upload', 974 974 label : editor.lang.image.btnUpload, 975 style: 'height:40px', 975 976 size : 38 976 977 }, 977 978 { -
_source/plugins/link/dialogs/link.js
828 828 type : 'file', 829 829 id : 'upload', 830 830 label : editor.lang.common.upload, 831 size : 38 831 style: 'height:40px', 832 size : 29 832 833 }, 833 834 { 834 835 type : 'fileButton', -
CHANGES.html
44 44 <p> 45 45 Fixed issues:</p> 46 46 <ul> 47 <li><a href="http://dev.fckeditor.net/ticket/3642">#3642</a> : Fixed file type form field layout</li> 47 48 <li><a href="http://dev.fckeditor.net/ticket/3859">#3859</a> : Fixed Flash dialog layout in Webkit</li> 48 49 <li><a href="http://dev.fckeditor.net/ticket/3852">#3852</a> : Disabled textarea resizing in dialogs</li> 49 50 <li><a href="http://dev.fckeditor.net/ticket/3781">#3781</a> : Colorbutton is now disabled in 'source' mode</li>