Ticket #3028: 3028_heavy.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()
@@ -98 +95 @@
                                         // Do that once only.
                                         event.removeListener();
 
+                                        if ( editor.config.startupFocus )
+                                                editor.focus();
+
                                         // Grab editor focus if the editor container is focused. (#3104)
                                         editor.container.on( 'focus', function()
                                                 {
                                                         editor.focus();
                                                 });
 
+                                        if ( editor.config.onLoad )
+                                                editor.config.onLoad( editor );
+
                                         // Fire instanceReady for both the editor and CKEDITOR.
                                         editor.fireOnce( 'instanceReady' );
                                         CKEDITOR.fire( 'instanceReady', null, editor );

_source/plugins/sourcearea/plugin.js

@@ -18 +18 @@
 
                 editor.on( 'editingBlockReady', function()
                         {
-                                var textarea;
+                                var textarea,
+                                        checkFocusTimes = editor.config.startupMode == 'source' ? 10 : 0;               // Check startup focus 10 times.
 
                                 editor.addMode( 'source',
                                         {
@@ -73 +74 @@
                                                         // Set the <textarea> value.
                                                         this.loadData( data );
 
-                                                        var keystrokeHandler = editor.keystrokeHandler;
-                                                        if ( keystrokeHandler )
-                                                                keystrokeHandler.attach( textarea );
+                                                        var addHandlers = function( )
+                                                        {
+                                                                textarea.on( 'blur', function()
+                                                                        {
+                                                                                editor.focusManager.blur();
+                                                                        });
 
-                                                        editor.mode = 'source';
-                                                        editor.fire( 'mode' );
+                                                                textarea.on( 'focus', function()
+                                                                        {
+                                                                                editor.focusManager.focus();
+                                                                        } );
+                                                        }
+                                                        if ( CKEDITOR.env.ie )
+                                                                addHandlers();
+                                                        
+                                                        var textareaReady = function()
+                                                        {
+                                                                var keystrokeHandler = editor.keystrokeHandler;
+                                                                if ( keystrokeHandler )
+                                                                        keystrokeHandler.attach( textarea );
+
+                                                                if ( !CKEDITOR.env.ie )
+                                                                        addHandlers();
+
+                                                                editor.mode = 'source';
+                                                                editor.fire( 'mode' );
+                                                        };
+
+                                                        if ( checkFocusTimes > 0 )              // Only once, if startupFocus is set.
+                                                        {
+                                                                // Check if the startup focus was set. If so - fire 'mode' event.
+                                                                var checkFocus = function()
+                                                                {
+                                                                        if ( checkFocusTimes <= 0 || !editor.config.startupFocus )              // Element is ready
+                                                                        {
+                                                                                textarea.$.blur();              // Startup focus is set in 'mode' listener.
+                                                                                textareaReady();
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                                try     {textarea.$.focus();}catch ( e ){}                      // Use 'try' due to IE bug.
+
+                                                                                checkFocusTimes--;
+                                                                                setTimeout( checkFocus,  200 );
+                                                                        }
+                                                                };
+
+                                                                textarea.on( 'focus', function( event )
+                                                                {
+                                                                        checkFocusTimes = 0;
+                                                                        event.removeListener();
+                                                                }, textarea );
+
+                                                                checkFocus();
+                                                        }
+                                                        else
+                                                                textareaReady();
                                                 },
 
                                                 loadData : function( data )

_source/plugins/wysiwygarea/plugin.js

@@ -102 +102 @@
                                                 iframe,
                                                 isLoadingData,
                                                 isPendingFocus,
-                                                fireMode;
+                                                fireMode,
+                                                checkFocusTimes = editor.config.startupMode == 'wysiwyg' ? 10 : 0;              // Check startup focus 10 times.
 
                                         // The following information is needed for IE only.
                                         var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname;
@@ -224 +225 @@
                                                 domWindow       = editor.window         = new CKEDITOR.dom.window( domWindow );
                                                 domDocument     = editor.document       = new CKEDITOR.dom.document( domDocument );
 
-                                                var focusTarget = ( CKEDITOR.env.ie || CKEDITOR.env.safari ) ?
+                                                var focusTarget = ( CKEDITOR.env.ie || CKEDITOR.env.webkit ) ?
                                                                 domWindow : domDocument;
 
                                                 focusTarget.on( 'blur', function()
@@ -247 +248 @@
                                                 if ( editor.contextMenu )
                                                         editor.contextMenu.addTarget( domDocument );
 
-                                                if ( fireMode )
+                                                isLoadingData = false;
+
+                                                var documentReady = function()
                                                 {
-                                                        editor.mode = 'wysiwyg';
-                                                        editor.fire( 'mode' );
-                                                        fireMode = false;
-                                                }
+                                                        if ( fireMode )
+                                                        {
+                                                                editor.mode = 'wysiwyg';
+                                                                editor.fire( 'mode' );
+                                                                fireMode = false;
+                                                        }
 
-                                                isLoadingData = false;
+                                                        if ( isPendingFocus )
+                                                                editor.focus();
+                                                };
+        
+                                                if ( editor.config.startupFocus && ( CKEDITOR.env.ie || CKEDITOR.env.opera ) && checkFocusTimes > 0 )
+                                                {
+                                                        // #3028. Check if the startup focus was set. If so - element is ready.
+                                                        var checkFocus = function()
+                                                        {
+                                                                if ( checkFocusTimes <= 0 )
+                                                                        documentReady();
+                                                                else
+                                                                {
+                                                                        editor.window.focus();
+                                                                        checkFocusTimes--;
+                                                                        setTimeout( checkFocus, 200 );
+                                                                }
+                                                        };
 
-                                                if ( isPendingFocus )
-                                                        editor.focus();
+                                                        focusTarget.on( 'focus', function( event )
+                                                        {
+                                                                checkFocusTimes = 0;
+                                                                event.removeListener();
+                                                        }, focusTarget );
+
+                                                        checkFocus();
+                                                }
+                                                else
+                                                        documentReady();
                                         };
 
                                         editor.addMode( 'wysiwyg',