Ticket #3494: 3494_2.patch
File 3494_2.patch, 3.9 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 { … … 192 195 193 196 var panelLoad = CKEDITOR.tools.bind( function () 194 197 { 198 var target = element.getFirst(); 199 195 200 if ( block.autoSize ) 196 201 { 197 var target = element.getFirst(); 202 // We must adjust first the width or IE6 could include extra lines in the height computation 203 var widthNode = block.element.$; 204 205 if ( CKEDITOR.env.gecko || CKEDITOR.env.opera) 206 widthNode = widthNode.parentNode; 207 208 if ( CKEDITOR.env.ie) 209 widthNode = widthNode.document.body; 210 211 var width = widthNode.scrollWidth; 212 // Account for extra height needed due to IE quirks box model bug: 213 // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug 214 // (#3426) 215 if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && width > 0 ) 216 width += ( target.$.offsetWidth || 0 ) - ( target.$.clientWidth || 0 ); 217 // A little extra at the end. 218 // If not present, IE6 might break into the next line, but also it looks better this way 219 width += 4 ; 220 221 target.setStyle( 'width', width + 'px' ); 222 223 // IE doesn't compute the scrollWidth if a filter is applied previously 224 block.element.addClass( 'cke_frameLoaded') 225 198 226 var height = block.element.$.scrollHeight; 199 227 200 228 // Account for extra height needed due to IE quirks box model bug: … … 209 237 panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' ); 210 238 } 211 239 else 212 element.getFirst().removeStyle( 'height' );240 target.removeStyle( 'height' ); 213 241 214 242 var panelElement = panel.element, 215 243 panelWindow = panelElement.getWindow(), -
_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_skin_kama .cke_frameLoaded .cke_menuitem .cke_label 100 { 99 101 filter: alpha(opacity=70); /* IE */ 100 102 opacity: 0.70; /* Safari, Opera and Mozilla */ 101 103 } -
_source/skins/office2003/menu.css
93 93 height:19px; 94 94 margin-left: 24px; 95 95 background-color: #fff; 96 _overflow: hidden; 97 _width: 80px; 96 } 97 /* Set these after the document has been loaded and we know the dimensions*/ 98 .cke_skin_office2003 .cke_frameLoaded .cke_menuitem .cke_label 99 { 98 100 filter: alpha(opacity=70); /* IE */ 99 101 opacity: 0.70; /* Safari, Opera and Mozilla */ 100 102 } -
_source/skins/v2/menu.css
93 93 height:19px; 94 94 margin-left: 24px; 95 95 background-color: #fff; 96 _overflow: hidden; 97 _width: 80px; 96 } 97 /* Set these after the document has been loaded and we know the dimensions*/ 98 .cke_skin_v2 .cke_frameLoaded .cke_menuitem .cke_label 99 { 98 100 filter: alpha(opacity=70); /* IE */ 99 101 opacity: 0.70; /* Safari, Opera and Mozilla */ 100 102 }