Ticket #4555: 4555_2.patch

_source/core/dom/domobject.js

@@ -115 +115 @@
                                         delete nativeListeners[ eventName ];
                                 }
                         }
+                },
+
+                /** @ignore */
+                removeAllListeners : function()
+                {
+                        // Call the original implementation.
+                        CKEDITOR.event.prototype.removeAllListeners.apply( this );
+
+                        var nativeListeners = this.getCustomData( '_cke_nativeListeners' );
+                        for( eventName in nativeListeners)
+                        {
+                                var listener = nativeListeners[ eventName ];
+                                if ( this.$.removeEventListener )
+                                        this.$.removeEventListener( eventName, listener, false );
+                                else if ( this.$.detachEvent )
+                                        this.$.detachEvent( 'on' + eventName, listener );
+
+                                delete nativeListeners[ eventName ];
+                        }
                 }
         };
 })();
@@ -197 +216 @@
         };
 
         /**
+         * @name CKEDITOR.dom.domObject.prototype.clearCustomData
+         */
+        domObjectProto.clearCustomData = function()
+        {
+                var expandoNumber = this.$._cke_expando;
+                expandoNumber && delete customData[ expandoNumber ];
+        };
+
+        /**
          * @name CKEDITOR.dom.domObject.prototype.getCustomData
          */
         domObjectProto.getUniqueId = function()

_source/core/editor.js

@@ -468 +468 @@
                         if ( !noUpdate )
                                 this.updateElement();
 
+                        if ( this.mode )
+                        {
+                                var holderElement = this.getThemeSpace( 'contents' ),
+                                        currentMode = this._.modes[ editor.mode ] ;
+                                currentMode.unload( holderElement );
+                                this.mode = '';
+                        }
+
                         this.theme.destroy( this );
-                        this.fire( 'destroy' );
+                        delete this.focusManager._.editor;
+                        delete this.ui._.editor;
+
+                        if (CKEDITOR.ui.button)
+                        {
+                                var globalItems = CKEDITOR.ui.button._.instances;
+                                for(var index in globalItems)
+                                {
+                                        button = globalItems[index];
+                                        if (button && button.editor == this)
+                                                globalItems[index] = null;
+                                }
+                        }
+
+                        var commands = this._.commands;
+                        for (var command in commands)
+                        {
+                                var o = commands[command];
+                                o.removeAllListeners();
+
+                                for (var items in o.uiItems)
+                                {
+                                        if (o.uiItems._)
+                                                delete o.uiItems._.editor
+                                }
+
+                                delete commands[command];
+                        }
+
+                        this.fireOnce( 'destroy' );
+                        this.removeAllListeners();
+
                         CKEDITOR.remove( this );
                         CKEDITOR.fire( 'instanceDestroyed', null, this );
                 },

_source/core/event.js

@@ -314 +314 @@
                                         var index = event.getListenerIndex( listenerFunction );
                                         if ( index >= 0 )
                                                 event.listeners.splice( index, 1 );
+                                        // Clear the event if there are no more listeners
+                                        if (event.listeners.length==0)
+                                                delete getPrivate( this )[ eventName ]
                                 }
                         },
 
+                        removeAllListeners : function()
+                        {
+                                var events = getPrivate( this );
+                                for(e in events)
+                                {
+                                        delete events[ e ];
+                                }
+                        },
                         /**
                          * Checks if there is any listener registered to a given event.
                          * @param {String} eventName The event name.

_source/plugins/button/plugin.js

@@ -92 +92 @@
 
                 var clickFn = CKEDITOR.tools.addFunction( instance.execute, instance );
 
+                editor.on( 'destroy', function () {
+                                CKEDITOR.tools.removeFunction( clickFn );
+                                delete instance.editor;
+                                delete instance.execute;
+                                delete instance.toolbar;
+                                delete instance.button;
+                        } );
+
                 var index = CKEDITOR.ui.button._.instances.push( instance ) - 1;
 
                 var classes = '';

_source/plugins/toolbar/plugin.js

@@ -283 +283 @@
                                                                 {
                                                                         editor.execCommand( 'toolbarCollapse' );
                                                                 } );
+                                                        editor.on( 'destroy', function () {
+                                                                        CKEDITOR.tools.removeFunction( collapserFn );
+                                                                } );
 
                                                         var collapserId = 'cke_' + CKEDITOR.tools.getNextNumber();
 

_source/plugins/wysiwygarea/plugin.js

@@ -690 +690 @@
 
                                                         unload : function( holderElement )
                                                         {
+                                                                var htmlElement = editor.document.getDocumentElement()
+                                                                htmlElement.removeAllListeners();
+                                                                htmlElement.clearCustomData();
+
+                                                                editor.window.removeAllListeners();
+                                                                editor.window.clearCustomData();
+
+                                                                editor.document.removeAllListeners();
+                                                                editor.document.clearCustomData();
+
                                                                 editor.window = editor.document = iframe = mainElement = isPendingFocus = null;
 
                                                                 editor.fire( 'contentDomUnload' );
@@ -758 +768 @@
                                                         editor.focus();
                                                 } );
                                 } );
+                                editor.on( 'destroy', function()
+                                {
+                                        ieFocusGrabber.removeAllListeners();
+                                        ieFocusGrabber.clearCustomData();
+                                        ieFocusGrabber.remove()
+                                        ieFocusGrabber = null;
+                                } );
                         }
                 }
         });

_source/themes/default/theme.js

@@ -229 +229 @@
                 destroy : function( editor )
                 {
                         var container = editor.container;
+                        container.removeAllListeners();
+                        container.clearCustomData();
 
                         /*
                          * IE BUG: Removing the editor DOM elements while the selection is inside
@@ -254 +256 @@
 
                         if ( container )
                                 container.remove();
+                        delete editor.container;
 
                         if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
-                        {
                                 editor.element.show();
-                                delete editor.element;
-                        }
+
+                        delete editor.element;
                 }
         };
 })() );