Ticket #3879: 3879.patch

CHANGES.html

@@ -93 +93 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3639">#3639</a> : Button size was inconsistent.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3874">#3874</a> : Paste as plain text in Safari loosing lines.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3849">#3849</a> : Fixed IE8 crashes when applying lists and indenting.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3879">#3879</a> : Color button panel was incorrect size on first open in webkit.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>

_source/plugins/floatpanel/plugin.js

@@ -198 +198 @@
                                                         {
                                                                 var target = element.getFirst();
                                                                 var height = block.element.$.scrollHeight;
+                                                                var firstChild;
 
-                                                                // Account for extra height needed due to IE quirks box model bug:
-                                                                // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug
-                                                                // (#3426)
-                                                                if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && height > 0 )
-                                                                        height += ( target.$.offsetHeight || 0 ) - ( target.$.clientHeight || 0 );
+                                                                // Delay height determination on webkit until first child (if any) will have a height. (#3879)
+                                                                if ( CKEDITOR.env.webkit && ( firstChild = block.element.getChild( 0 ) ) && !firstChild.$.scrollHeight )
+                                                                {
+                                                                        var interval = setInterval( function()
+                                                                                {
+                                                                                        if ( firstChild.$.scrollHeight )
+                                                                                        {
+                                                                                                height = block.element.$.scrollHeight;
+                                                                                                target.setStyle( 'height', height + 'px' );
+                                                                                                clearInterval( interval );
+                                                                                        }
+                                                                                }, 100);
+                                                                }
+                                                                else
+                                                                {
+                                                                        // Account for extra height needed due to IE quirks box model bug:
+                                                                        // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug
+                                                                        // (#3426)
+                                                                        if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && height > 0 )
+                                                                                height += ( target.$.offsetHeight || 0 ) - ( target.$.clientHeight || 0 );
 
-                                                                target.setStyle( 'height', height + 'px' );
+                                                                        target.setStyle( 'height', height + 'px' );
 
-                                                                // Fix IE < 8 visibility.
-                                                                panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' );
-                                                        }
+                                                                        // Fix IE < 8 visibility.
+                                                                        panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' );
+                                                                }
+                                                        }
 
                                                         if ( !CKEDITOR.env.gecko || panel.isLoaded )
                                                         {