Ticket #3028: 3028_2.patch

_source/plugins/editingblock/plugin.js

@@ -40 +40 @@
                         editor.on( 'uiReady', function()
                                 {
                                         editor.setMode( editor.config.startupMode );
-
-                                        if ( editor.config.startupFocus )
-                                                editor.focus();
                                 });
 
                         editor.on( 'afterSetData', function()
@@ -104 +101 @@
                                                         editor.focus();
                                                 });
 
+                                        if ( editor.config.startupFocus )
+                                                editor.focus();
+
                                         // Fire instanceReady for both the editor and CKEDITOR.
                                         editor.fireOnce( 'instanceReady' );
                                         CKEDITOR.fire( 'instanceReady', null, editor );

_source/plugins/sourcearea/plugin.js

@@ -77 +77 @@
                                                         if ( keystrokeHandler )
                                                                 keystrokeHandler.attach( textarea );
 
-                                                        editor.mode = 'source';
-                                                        editor.fire( 'mode' );
+                                                        setTimeout( function()
+                                                        {
+                                                                editor.mode = 'source';
+                                                                editor.fire( 'mode' );
+                                                        },
+                                                        ( CKEDITOR.env.gecko || CKEDITOR.env.webkit ) ? 100 : 0 );
                                                 },
 
                                                 loadData : function( data )