X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fthemes%2Fdefault%2Ftheme.js;fp=_source%2Fthemes%2Fdefault%2Ftheme.js;h=960ee0b507ccf4c0f43d8ef0ecb4e70581584e79;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=a281843d495481af02c1fc4c82aca35d189c4dcc;hpb=9afde8772159bd3436f1f5b7862960307710ae5a;p=ckeditor.git diff --git a/_source/themes/default/theme.js b/_source/themes/default/theme.js index a281843..960ee0b 100644 --- a/_source/themes/default/theme.js +++ b/_source/themes/default/theme.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -26,7 +26,9 @@ CKEDITOR.themes.add( 'default', (function() { // Creates an HTML structure that reproduces the editor class hierarchy. var html = - '' + + '' + '' + '' + '' + @@ -241,17 +243,21 @@ CKEDITOR.themes.add( 'default', (function() destroy : function( editor ) { - var container = editor.container; - container.clearCustomData(); - editor.element.clearCustomData(); + var container = editor.container, + element = editor.element; if ( container ) + { + container.clearCustomData(); container.remove(); + } - if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE ) - editor.element.show(); - - delete editor.element; + if ( element ) + { + element.clearCustomData(); + editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE && element.show(); + delete editor.element; + } } }; })() ); @@ -331,7 +337,7 @@ CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, res */ CKEDITOR.editor.prototype.getResizable = function() { - return this.container.getChild( 1 ); + return this.container; }; /** @@ -363,6 +369,6 @@ CKEDITOR.editor.prototype.getResizable = function() /** * Fired after the editor instance is resized through * the {@link CKEDITOR.editor.prototype.resize} method. - * @name CKEDITOR#resize + * @name CKEDITOR.editor#resize * @event */