vanilla ckeditor-3.3

[ckeditor.git] / _source / themes / default / theme.js

diff --git a/_source/themes/default/theme.js b/_source/themes/default/theme.js
index ef0f7c9..078eb19 100644 (file)
--- a/_source/themes/default/theme.js
+++ b/_source/themes/default/theme.js
@@ -118,6 +118,7 @@ CKEDITOR.themes.add( 'default', (function()
                                        ' dir="', editor.lang.dir, '"' +\r
                                        ' title="', ( CKEDITOR.env.gecko ? ' ' : '' ), '"' +\r
                                        ' lang="', editor.langCode, '"' +\r
+                                       ( CKEDITOR.env.webkit? ' tabindex="' + tabIndex + '"' : '' ) +\r
                                        ' role="application"' +\r
                                        ' aria-labelledby="cke_', name, '_arialbl"' +\r
                                        ( style ? ' style="' + style + '"' : '' ) +\r
@@ -126,9 +127,9 @@ CKEDITOR.themes.add( 'default', (function()
                                        '<span class="' , CKEDITOR.env.cssClass, '" role="presentation">' +\r
                                                '<span class="cke_wrapper cke_', editor.lang.dir, '" role="presentation">' +\r
                                                        '<table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody>' +\r
-                                                               '<tr', topHtml          ? '' : ' style="display:none"', '><td id="cke_top_'             , name, '" class="cke_top" role="presentation">'        , topHtml               , '</td></tr>' +\r
-                                                               '<tr', contentsHtml     ? '' : ' style="display:none"', '><td id="cke_contents_', name, '" class="cke_contents" style="height:', height, '" role="presentation">', contentsHtml, '</td></tr>' +\r
-                                                               '<tr', bottomHtml       ? '' : ' style="display:none"', '><td id="cke_bottom_'  , name, '" class="cke_bottom" role="presentation">'     , bottomHtml    , '</td></tr>' +\r
+                                                               '<tr', topHtml          ? '' : ' style="display:none"', ' role="presentation"><td id="cke_top_'         , name, '" class="cke_top" role="presentation">'        , topHtml               , '</td></tr>' +\r
+                                                               '<tr', contentsHtml     ? '' : ' style="display:none"', ' role="presentation"><td id="cke_contents_', name, '" class="cke_contents" style="height:', height, '" role="presentation">', contentsHtml, '</td></tr>' +\r
+                                                               '<tr', bottomHtml       ? '' : ' style="display:none"', ' role="presentation"><td id="cke_bottom_'      , name, '" class="cke_bottom" role="presentation">'     , bottomHtml    , '</td></tr>' +\r
                                                        '</tbody></table>' +\r
                                                        //Hide the container when loading skins, later restored by skin css.\r
                                                        '<style>.', editor.skinClass, '{visibility:hidden;}</style>' +\r
@@ -229,6 +230,8 @@ CKEDITOR.themes.add( 'default', (function()
                destroy : function( editor )\r
                {\r
                        var container = editor.container;\r
+                       container.clearCustomData();\r
+                       editor.element.clearCustomData();\r
 \r
                        /*\r
                         * IE BUG: Removing the editor DOM elements while the selection is inside\r
@@ -256,10 +259,9 @@ CKEDITOR.themes.add( 'default', (function()
                                container.remove();\r
 \r
                        if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )\r
-                       {\r
                                editor.element.show();\r
-                               delete editor.element;\r
-                       }\r
+\r
+                       delete editor.element;\r
                }\r
        };\r
 })() );\r