Ticket #7014: 7014.patch

_source/themes/default/theme.js

@@ -243 +243 @@
 
                 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;
+                        }
+                }
         };
 })() );
 

_source/plugins/richcombo/plugin.js

@@ -290 +290 @@
                         this._.value = value;
 
                         var textElement = this.document.getById( 'cke_' + this.id + '_text' );
-
-                        if ( !( value || text ) )
-                        {
-                                text = this.label;
-                                textElement.addClass( 'cke_inline_label' );
-                        }
-                        else
-                                textElement.removeClass( 'cke_inline_label' );
+                        if ( textElement )
+                        {
+                                if ( !( value || text ) )
+                                {
+                                        text = this.label;
+                                        textElement.addClass( 'cke_inline_label' );
+                                }
+                                else
+                                        textElement.removeClass( 'cke_inline_label' );
 
-                        textElement.setHtml( typeof text != 'undefined' ? text : value );
+                                textElement.setHtml( typeof text != 'undefined' ? text : value );
+                        }
                 },
 
                 getValue : function()

_source/plugins/editingblock/plugin.js

@@ -116 +116 @@
                         editor.on( 'destroy', function ()
                         {
                                 // ->           currentMode.unload( holderElement );
-                                this._.modes[ this.mode ].unload( this.getThemeSpace( 'contents' ) );
+                                if ( this.mode )
+                                        this._.modes[ this.mode ].unload( this.getThemeSpace( 'contents' ) );
                         });
                 }
         });

_source/core/editor.js

@@ -547 +547 @@
                         if ( !noUpdate )
                                 this.updateElement();
 
-                        this.theme.destroy( this );
+                        this.theme && this.theme.destroy( this );
 
                         this.fire( 'destroy' );
                         CKEDITOR.remove( this );