Ticket #3494: 3494.patch
File 3494.patch, 2.1 KB (added by , 13 years ago) |
---|
-
_source/plugins/floatpanel/plugin.js
135 135 display : '' 136 136 }); 137 137 138 // To allow the context menu to decrease back their width 139 element.getFirst().removeStyle('width'); 140 138 141 // Configure the IFrame blur event. Do that only once. 139 142 if ( !this._.blurSet ) 140 143 { … … 205 208 206 209 target.setStyle( 'height', height + 'px' ); 207 210 211 var widthNode = block.element.$.parentNode; 212 213 if ( CKEDITOR.env.ie) 214 widthNode = widthNode.document.body; 215 216 var width = widthNode.scrollWidth; 217 // Account for extra height needed due to IE quirks box model bug: 218 // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug 219 // (#3426) 220 if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && width > 0 ) 221 width += ( target.$.offsetWidth || 0 ) - ( target.$.clientWidth || 0 ); 222 223 if (CKEDITOR.env.ie) 224 width += 4; 225 226 target.setStyle( 'width', width + 'px' ); 227 228 // IE doesn't compute the scrollWidth if a filter is applied previously 229 block.element.addClass( 'cke_frameLoaded') 230 208 231 // Fix IE < 8 visibility. 209 232 panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' ); 210 233 } -
_source/skins/kama/menu.css
94 94 height:19px; 95 95 margin-left: 24px; 96 96 background-color: #fff; 97 _overflow: hidden; 98 _width: 80px; 97 } 98 /* Set these after the document has been loaded and we know the dimensions*/ 99 .cke_frameLoaded .cke_menuitem .cke_label 100 { 99 101 filter: alpha(opacity=70); /* IE */ 100 102 opacity: 0.70; /* Safari, Opera and Mozilla */ 103 _overflow: hidden; 104 /*_width: 80px;*/ 101 105 } 102 103 106 .cke_rtl .cke_skin_kama .cke_menuitem .cke_label 104 107 { 105 108 padding-right: 0;