vanilla ckeditor-3.5.1

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

diff --git a/_source/themes/default/theme.js b/_source/themes/default/theme.js
index a281843..960ee0b 100644 (file)
--- a/_source/themes/default/theme.js
+++ b/_source/themes/default/theme.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -26,7 +26,9 @@ CKEDITOR.themes.add( 'default', (function()
                {\r
                        // Creates an HTML structure that reproduces the editor class hierarchy.\r
                        var html =\r
-                               '<span class="cke_shared">' +\r
+                               '<span class="cke_shared "' +\r
+                               ' dir="'+ editor.lang.dir + '"' +\r
+                               '>' +\r
                                '<span class="' + editor.skinClass + ' ' + editor.id + ' cke_editor_' + editor.name + '">' +\r
                                '<span class="' + CKEDITOR.env.cssClass + '">' +\r
                                '<span class="cke_wrapper cke_' + editor.lang.dir + '">' +\r
@@ -241,17 +243,21 @@ CKEDITOR.themes.add( 'default', (function()
 \r
                destroy : function( editor )\r
                {\r
-                       var container = editor.container;\r
-                       container.clearCustomData();\r
-                       editor.element.clearCustomData();\r
+                       var container = editor.container,\r
+                               element = editor.element;\r
 \r
                        if ( container )\r
+                       {\r
+                               container.clearCustomData();\r
                                container.remove();\r
+                       }\r
 \r
-                       if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )\r
-                               editor.element.show();\r
-\r
-                       delete editor.element;\r
+                       if ( element )\r
+                       {\r
+                               element.clearCustomData();\r
+                               editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE && element.show();\r
+                               delete editor.element;\r
+                       }\r
                }\r
        };\r
 })() );\r
@@ -331,7 +337,7 @@ CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, res
  */\r
 CKEDITOR.editor.prototype.getResizable = function()\r
 {\r
-       return this.container.getChild( 1 );\r
+       return this.container;\r
 };\r
 \r
 /**\r
@@ -363,6 +369,6 @@ CKEDITOR.editor.prototype.getResizable = function()
 /**\r
  * Fired after the editor instance is resized through\r
  * the {@link CKEDITOR.editor.prototype.resize} method.\r
- * @name CKEDITOR#resize\r
+ * @name CKEDITOR.editor#resize\r
  * @event\r
  */\r