Index: CHANGES.html
===================================================================
--- CHANGES.html (revision 3853)
+++ CHANGES.html Fri Jul 10 08:18:22 CEST 2009
@@ -117,6 +117,7 @@
#3887 : Fixed an issue in which the create
list command may leak outside of a selected table cell and into the rest of document.
#3916 : Fixed maximize does not enlarge editor width when width is set.
+ #3879 : [webkit] Color button panel had incorrect size on first open.
CKEditor 3.0 RC
Index: _source/plugins/panel/plugin.js
===================================================================
--- _source/plugins/panel/plugin.js (revision 3853)
+++ _source/plugins/panel/plugin.js Fri Jul 10 08:11:17 CEST 2009
@@ -133,7 +133,6 @@
className = parentDiv.getParent().getAttribute( 'class' ),
langCode = parentDiv.getParent().getAttribute( 'lang' ),
doc = iframe.getFrameDocument();
-
// Initialize the IFRAME document body.
doc.$.open();
@@ -141,13 +140,21 @@
if ( CKEDITOR.env.isCustomDomain() )
doc.$.domain = document.domain;
+ var onLoad = CKEDITOR.tools.addFunction( CKEDITOR.tools.bind( function( ev )
+ {
+ this.isLoaded = true;
+ if ( this.onLoad )
+ this.onLoad();
+ }, this ) );
+
doc.$.write(
'' +
'' +
'' +
'' +
'' +
- '' +
+ '' +
'' +
// It looks strange, but for FF2, the styles must go
// after , so it (body) becames immediatelly
@@ -161,14 +168,6 @@
// Register the CKEDITOR global.
win.$.CKEDITOR = CKEDITOR;
- win.on( 'load', function( ev )
- {
- this.isLoaded = true;
- if ( this.onLoad )
- this.onLoad();
- },
- this);
-
doc.on( 'keydown', function( evt )
{
var keystroke = evt.data.getKeystroke();
Index: _source/plugins/floatpanel/plugin.js
===================================================================
--- _source/plugins/floatpanel/plugin.js (revision 3853)
+++ _source/plugins/floatpanel/plugin.js Fri Jul 10 08:12:01 CEST 2009
@@ -211,15 +211,8 @@
panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' );
}
- if ( !CKEDITOR.env.gecko || panel.isLoaded )
- {
- // IE7 needs some time (setting the delay to 0ms won't work) to refresh
- // the scrollHeight. (#3174)
- if ( CKEDITOR.env.ie && CKEDITOR.env.version >= 7 )
- setTimeout( setHeight, 50 );
- else
+ if ( panel.isLoaded )
- setHeight();
+ setHeight();
- }
else
panel.onLoad = setHeight;
}