Ticket #7324: 7324.patch
File 7324.patch, 5.3 KB (added by , 13 years ago) |
---|
-
_source/plugins/dialog/plugin.js
2227 2227 2228 2228 // Write the inline CSS styles. 2229 2229 var styleStr = ( elementDefinition.style || '' ).split( ';' ); 2230 2231 // Element alignment support. 2232 if ( elementDefinition.align ) 2233 { 2234 var align = elementDefinition.align; 2235 styles[ 'margin-left' ] = align == 'left' ? 0 : 'auto'; 2236 styles[ 'margin-right' ] = align == 'right' ? 0 : 'auto'; 2237 } 2238 2230 2239 for ( i in styles ) 2231 2240 styleStr.push( i + ':' + styles[i] ); 2232 2241 if ( elementDefinition.hidden ) … … 2357 2366 styles.push( 'height:' + cssLength( height ) ); 2358 2367 if ( elementDefinition && elementDefinition.padding != undefined ) 2359 2368 styles.push( 'padding:' + cssLength( elementDefinition.padding ) ); 2369 // In IE Quirks alignment has to be done on table cells. (#7324) 2370 if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && children[ i ].align ) 2371 styles.push( 'text-align:' + children[ i ].align ); 2360 2372 if ( styles.length > 0 ) 2361 2373 html.push( 'style="' + styles.join('; ') + '" ' ); 2362 2374 html.push( '>', childHtmlList[i], '</td>' ); … … 2442 2454 styles.push( 'height:' + Math.floor( 100 / childHtmlList.length ) + '%' ); 2443 2455 if ( elementDefinition && elementDefinition.padding != undefined ) 2444 2456 styles.push( 'padding:' + cssLength( elementDefinition.padding ) ); 2457 // In IE Quirks alignment has to be done on table cells. (#7324) 2458 if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && children[ i ].align ) 2459 styles.push( 'text-align:' + children[ i ].align ); 2445 2460 if ( styles.length > 0 ) 2446 2461 html.push( 'style="', styles.join( '; ' ), '" ' ); 2447 2462 html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[i], '</td></tr>' ); -
_source/plugins/liststyle/dialogs/liststyle.js
46 46 type : 'select', 47 47 label : lang.type, 48 48 id : 'type', 49 style : 'width: 150px; margin: auto;', 49 align : 'center', 50 style : 'width:150px', 50 51 items : 51 52 [ 52 53 [ lang.notset, '' ], -
_source/skins/v2/menu.css
130 130 margin-left: 24px; 131 131 background-color: #fff; 132 132 } 133 134 /* IE quirks menu item height fix. (#7324) */ 135 .cke_browser_ie.cke_browser_quirks .cke_skin_v2 .cke_menuitem .cke_label 136 { 137 height:24px; 138 } 139 133 140 /* Set these after the document has been loaded and we know the dimensions*/ 134 141 .cke_skin_v2 .cke_frameLoaded .cke_menuitem .cke_label 135 142 { -
_source/skins/kama/menu.css
130 130 margin-left: 24px; 131 131 background-color: #fff; 132 132 } 133 134 /* IE quirks menu item height fix. (#7324) */ 135 .cke_browser_ie.cke_browser_quirks .cke_skin_kama .cke_menuitem .cke_label 136 { 137 height:24px; 138 } 139 133 140 /* Set these after the document has been loaded and we know the dimensions*/ 134 141 .cke_skin_kama .cke_frameLoaded .cke_menuitem .cke_label 135 142 { -
_source/plugins/floatpanel/plugin.js
213 213 // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug 214 214 // (#3426) 215 215 if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && width > 0 ) 216 width += ( target.$.offsetWidth || 0 ) - ( target.$.clientWidth || 0 ) ;216 width += ( target.$.offsetWidth || 0 ) - ( target.$.clientWidth || 0 ) + 3; 217 217 // A little extra at the end. 218 218 // If not present, IE6 might break into the next line, but also it looks better this way 219 219 width += 4 ; … … 229 229 // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug 230 230 // (#3426) 231 231 if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && height > 0 ) 232 height += ( target.$.offsetHeight || 0 ) - ( target.$.clientHeight || 0 ) ;232 height += ( target.$.offsetHeight || 0 ) - ( target.$.clientHeight || 0 ) + 3; 233 233 234 234 target.setStyle( 'height', height + 'px' ); 235 235 -
_source/skins/office2003/menu.css
130 130 margin-left: 24px; 131 131 background-color: #fff; 132 132 } 133 134 /* IE quirks menu item height fix. (#7324) */ 135 .cke_browser_ie.cke_browser_quirks .cke_skin_office2003 .cke_menuitem .cke_label 136 { 137 height:24px; 138 } 139 133 140 /* Set these after the document has been loaded and we know the dimensions*/ 134 141 .cke_skin_office2003 .cke_frameLoaded .cke_menuitem .cke_label 135 142 {