Ticket #8226: 8226_4.patch

_source/core/dom/element.js

@@ -1479 +1479 @@
                                 }
                         }
 
-                        return $ && new CKEDITOR.dom.document( $.contentWindow.document );
+                        return $ && $.contentWindow && new CKEDITOR.dom.document( $.contentWindow.document );
                 },
 
                 /**
@@ -1580 +1580 @@
                         return this.$.childNodes.length;
                 },
 
+                /**
+                 *  Whether this element is not yet presented in the DOM tree.
+                 */
+                isOffline : function()
+                {
+                        var root = this.getDocument().getDocumentElement();
+                        return !root.contains( this );
+                },
+
                 disableContextMenu : function()
                 {
                         this.on( 'contextmenu', function( event )

_source/themes/default/theme.js

@@ -188 +188 @@
                                 toolbarSpace && toolbarSpace.getParent().getParent()[ func ]( 'cke_mixed_dir_content' );
                         });
 
+                        editor.on( 'destroy', function()
+                        {
+                                var container = editor.container,
+                                        element = editor.element;
+                                container && container.clearCustomData();
+                                element.clearCustomData();
+                        });
+
                         editor.fireOnce( 'themeLoaded' );
                         editor.fireOnce( 'uiReady' );
                 },
@@ -267 +275 @@
                                 element = editor.element;
 
                         if ( container )
-                        {
-                                container.clearCustomData();
                                 container.remove();
-                        }
 
                         if ( element )
                         {
-                                element.clearCustomData();
                                 editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE && element.show();
                                 delete editor.element;
                         }

_source/core/editor.js

@@ -465 +465 @@
                                                 || getNewName();
 
                         if ( this.name in CKEDITOR.instances )
-                                throw '[CKEDITOR.editor] The instance "' + this.name + '" already exists.';
+                        {
+                                var previous = CKEDITOR.instances[ this.name ];
 
+                                // Destroy detached editor silently.
+                                if ( previous.checkDetached() )
+                                        previous.destroy( false );
+                                else
+                                        throw '[CKEDITOR.editor] The instance "' + previous.name + '" already exists.';
+                        }
+
                         /**
                          * A unique random string assigned to each editor instance on the page.
                          * @name CKEDITOR.editor.prototype.id
@@ -562 +570 @@
                  */
                 destroy : function( noUpdate )
                 {
-                        if ( !noUpdate )
-                                this.updateElement();
 
+                        var notDetached = !this.checkDetached();
+                        notDetached && this.updateElement();
                         this.fire( 'destroy' );
-                        this.theme && this.theme.destroy( this );
+                        notDetached && this.theme && this.theme.destroy( this );
 
                         CKEDITOR.remove( this );
                         CKEDITOR.fire( 'instanceDestroyed', null, this );
@@ -865 +873 @@
                                 else
                                         element.setHtml( data );
                         }
+                },
+
+                /**
+                 * Check whether the editor UI has been removed from DOM thus
+                 * the editor instance is considered to be obsoleted.
+                 * @since 3.6.2
+                 * @example
+                 * editor.container.remove();
+                 * alert( editor.checkDetached() );
+                 */
+                checkDetached : function()
+                {
+                        this.element.isOffline() || this.container && this.container.isOffline();
                 }
         });