Ticket #4555: 4555_5.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()
+        {
+                // Clear all event listeners
+                this.removeAllListeners();
+
+                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.theme.destroy( this );
-                        this.fire( 'destroy' );
+
+                        var toolbars, 
+                                index, j, items;
+
+                        if (this.toolbox)
+                        {
+                                toolbars = this.toolbox.toolbars;
+                                for( index = 0; index < toolbars.length ; index++ )
+                                {
+                                        items = toolbars[ index ].items;
+                                        for ( j = 0; j<items.length ; j++)
+                                        {
+                                                var instance = items[ j ];
+                                                if ( instance.clickFn ) CKEDITOR.tools.removeFunction( instance.clickFn );
+                                                if ( instance.keyDownFn ) CKEDITOR.tools.removeFunction( instance.keyDownFn );
+
+                                                if ( instance.index ) CKEDITOR.ui.button._.instances[ instance.index ] = null;
+                                        }
+                                }
+                        }
+
+                        if (this.contextMenu)
+                                CKEDITOR.tools.removeFunction( this.contextMenu._.functionId );
+
+                        if (this._.filebrowserFn)
+                                CKEDITOR.tools.removeFunction( this._.filebrowserFn );
+
+                        this.fireOnce( 'destroy' );
+
                         CKEDITOR.remove( this );
                         CKEDITOR.fire( 'instanceDestroyed', null, this );
                 },

_source/core/event.js

@@ -318 +318 @@
                         },
 
                         /**
+                         * Removes any listener set on this object. 
+                         * To avoid memory leaks we must assure that there are no
+                         * references left after the object is no longer needed.
+                         */
+                        removeAllListeners : function()
+                        {
+                                var events = getPrivate( this );
+                                for(var e in events )
+                                        delete events[ e ];
+                        },
+
+                        /**
                          * Checks if there is any listener registered to a given event.
                          * @param {String} eventName The event name.
                          * @example

_source/core/imagecacher.js

@@ -11 +11 @@
         {
                 var doCallback = function()
                         {
+                                img.removeAllListeners();
                                 loaded[ image ] = 1;
                                 callback();
                         };

_source/plugins/button/plugin.js

@@ -69 +69 @@
          */
         render : function( editor, output )
         {
-                var env = CKEDITOR.env;
+                var env = CKEDITOR.env,
+                        id = this._.id = 'cke_' + CKEDITOR.tools.getNextNumber(),
+                        classes = '',
+                        command = this.command, // Get the command name.
+                        clickFn,
+                        index;
 
-                var id = this._.id = 'cke_' + CKEDITOR.tools.getNextNumber();
                 this._.editor = editor;
 
                 var instance =
@@ -90 +94 @@
                         }
                 };
 
-                var clickFn = CKEDITOR.tools.addFunction( instance.execute, instance );
+                instance.clickFn = clickFn = CKEDITOR.tools.addFunction( instance.execute, instance );
 
-                var index = CKEDITOR.ui.button._.instances.push( instance ) - 1;
+                instance.index = index = CKEDITOR.ui.button._.instances.push( instance ) - 1;
 
-                var classes = '';
-
-                // Get the command name.
-                var command = this.command;
-
                 if ( this.modes )
                 {
                         editor.on( 'mode', function()

_source/plugins/resize/plugin.js

@@ -55 +55 @@
                                         }
                                 } );
 
+                        editor.on( 'destroy', function() { CKEDITOR.tools.removeFunction( mouseDownFn ) } );
+
                         editor.on( 'themeSpace', function( event )
                                 {
                                         if ( event.data.space == 'bottom' )

_source/plugins/richcombo/plugin.js

@@ -130 +130 @@
                                         var element = CKEDITOR.document.getById( id ).getChild( 1 );
                                         element.focus();
                                 },
-                                execute : clickFn
+                                clickFn : clickFn
                         };
 
                         editor.on( 'mode', function()
@@ -161 +161 @@
                                         ev.preventDefault();
                                 });
 
+                        // For clean up
+                        instance.keyDownFn = keyDownFn;
+
                         output.push(
                                 '<span class="cke_rcombo">',
                                 '<span id=', id );

_source/plugins/sourcearea/plugin.js

@@ -138 +138 @@
 
                                                 unload : function( holderElement )
                                                 {
+                                                        textarea.clearCustomData();
                                                         editor.textarea = textarea = null;
 
                                                         if ( onResize )

_source/plugins/toolbar/plugin.js

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

_source/plugins/wysiwygarea/plugin.js

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

_source/themes/default/theme.js

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