Ticket #5673: 5673.patch

_source/plugins/tab/plugin.js

@@ -51 +51 @@
                                         });
                         }
 
-                        if ( CKEDITOR.env.webkit )
+                        if ( CKEDITOR.env.webkit || CKEDITOR.env.gecko )
                         {
                                 editor.on( 'key', function( ev )
                                         {

_source/plugins/wysiwygarea/plugin.js

@@ -472 +472 @@
                                                         } );
                                                 }
 
-                                                var focusTarget = ( CKEDITOR.env.ie || CKEDITOR.env.webkit ) ?
-                                                                domWindow : domDocument;
-
-                                                focusTarget.on( 'blur', function()
+                                                domWindow.on( 'blur', function()
                                                         {
                                                                 editor.focusManager.blur();
                                                         });
 
-                                                focusTarget.on( 'focus', function()
+                                                domWindow.on( 'focus', function()
                                                         {
-                                                                // Force the cursor blinking. (#5622
-                                                                CKEDITOR.env.gecko && blinkCursor();
+                                                                var doc = editor.document;
+                                                                if ( CKEDITOR.env.gecko || CKEDITOR.env.opera )
+                                                                        doc.getBody().focus();
+                                                                else if ( CKEDITOR.env.webkit )
+                                                                        doc.getDocumentElement().focus();
+
                                                                 editor.focusManager.focus();
                                                         });
 
@@ -769 +770 @@
                                                                         isPendingFocus = true;
                                                                 else if ( editor.window )
                                                                 {
-                                                                        // [Webkit] Force the cursor blinking
-                                                                        // when setting focus manually. (#5622)
-                                                                        CKEDITOR.env.webkit && blinkCursor();
-
-                                                                        if ( CKEDITOR.env.opera )
-                                                                                editor.document.getBody().focus();
-                                                                        else
-                                                                                editor.window.focus();
+                                                                        editor.window.focus();
 
                                                                         editor.selectionChange();
                                                                 }