Ticket #5713: 5713.patch

_source/themes/default/theme.js

@@ -118 +118 @@
                                         ' dir="', editor.lang.dir, '"' +
                                         ' title="', ( CKEDITOR.env.gecko ? ' ' : '' ), '"' +
                                         ' lang="', editor.langCode, '"' +
+                                        ( CKEDITOR.env.webkit? ' tabindex="' + tabIndex + '"' : '' ) +
                                         ' role="application"' +
                                         ' aria-labelledby="cke_', name, '_arialbl"' +
                                         ( style ? ' style="' + style + '"' : '' ) +

_source/plugins/wysiwygarea/plugin.js

@@ -319 +319 @@
                                                         // for other browers, the 'src' attribute should be left empty to
                                                         // trigger iframe's 'load' event.
                                                         ' src="' + ( CKEDITOR.env.ie ? 'javascript:void(function(){' + encodeURIComponent( srcScript ) + '}())' : '' ) + '"' +
-                                                        ' tabIndex="' + editor.tabIndex + '"' +
+                                                        ' tabIndex="' + ( CKEDITOR.env.webkit? -1 : editor.tabIndex ) + '"' +
                                                         ' allowTransparency="true"' +
                                                         '></iframe>' );
 
@@ -495 +495 @@
                                                                 if ( CKEDITOR.env.gecko || CKEDITOR.env.opera )
                                                                         doc.getBody().focus();
                                                                 else if ( CKEDITOR.env.webkit )
+                                                                {
+                                                                        // Selection will get lost after move focus 
+                                                                        // to document element, save it first.
+                                                                        var sel = editor.getSelection(),
+                                                                                        type = sel.getType(),
+                                                                                        range = ( type != CKEDITOR.SELECTION_NONE ) && sel.getRanges()[ 0 ];
+
                                                                         doc.getDocumentElement().focus();
+                                                                        range && range.select();
+                                                                }
 
                                                                 editor.focusManager.focus();
                                                         });

_source/plugins/editingblock/plugin.js

@@ -95 +95 @@
                                         // Do that once only.
                                         event.removeListener();
 
+                                        // Redirect the focus into editor for webkit. (#5713)
+                                        CKEDITOR.env.webkit && editor.container.on( 'focus', function()
+                                                {
+                                                        editor.focus();
+                                                });
+
                                         if ( editor.config.startupFocus )
                                                 editor.focus();
 

_source/plugins/sourcearea/plugin.js

@@ -34 +34 @@
                                                         textarea.setAttributes(
                                                                 {
                                                                         dir : 'ltr',
-                                                                        tabIndex : editor.tabIndex,
+                                                                        tabIndex : CKEDITOR.env.webkit ? -1 : editor.tabIndex,
                                                                         'role' : 'textbox',
                                                                         'aria-label' : editor.lang.editorTitle.replace( '%1', editor.name )
                                                                 });