Ticket #5663: 5663.patch

_source/core/ckeditor.js

@@ -69 +69 @@
         delete CKEDITOR.instances[ editor.name ];
 };
 
+/**
+ * Perform global clean up to free as much memory as possible
+ * when there are no instances left
+ */
+CKEDITOR.on( 'instanceDestroyed', function ()
+        {
+                if ( CKEDITOR.tools.isEmpty( this.instances ) )
+                        CKEDITOR.fire( 'reset' );
+        });
+
 // Load the bootstrap script.
 CKEDITOR.loader.load( 'core/_bootstrap' );              // @Packager.RemoveLine
 

_source/core/dom/domobject.js

@@ -143 +143 @@
 {
         var customData = {};
 
+        CKEDITOR.on( 'reset', function()
+                {
+                        customData = {};
+                });
+
         /**
          * Determines whether the specified object is equal to the current object.
          * @name CKEDITOR.dom.domObject.prototype.equals

_source/core/tools.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -12 +12 @@
 {
         var functions = [];
 
+        CKEDITOR.on( 'reset', function()
+                {
+                        functions = [];
+                });
+
         /**
          * Utility functions.
          * @namespace

_source/plugins/button/plugin.js

@@ -270 +270 @@
 {
         this.add( name, CKEDITOR.UI_BUTTON, definition );
 };
+
+CKEDITOR.on( 'reset', function()
+        {
+                CKEDITOR.ui.button._.instances = [];
+        });

_source/plugins/wysiwygarea/plugin.js

@@ -798 +798 @@
                                 window.addEventListener( 'load', arguments.callee, false );
                         else
                         {
-                                body.setAttribute( 'onpageshow', body.getAttribute( 'onpageshow' )
-                                                + ';event.persisted && CKEDITOR.tools.callFunction(' +
-                                                CKEDITOR.tools.addFunction( function()
-                                                {
-                                                        var allInstances = CKEDITOR.instances,
-                                                                editor,
-                                                                doc;
-                                                        for ( var i in allInstances )
-                                                        {
-                                                                editor = allInstances[ i ];
-                                                                doc = editor.document;
-                                                                if ( doc )
-                                                                {
-                                                                        doc.$.designMode = 'off';
-                                                                        doc.$.designMode = 'on';
-                                                                }
-                                                        }
-                                                } ) + ')' );
+                                var currentHandler = body.getAttribute( 'onpageshow' );
+                                body.setAttribute( 'onpageshow', ( currentHandler ? currentHandler + ';' : '') +
+                                                        'event.persisted && (function(){' +
+                                                                'var allInstances = CKEDITOR.instances, editor, doc;' +
+                                                                'for ( var i in allInstances )' +
+                                                                '{' +
+                                                                '       editor = allInstances[ i ];' +
+                                                                '       doc = editor.document;' +
+                                                                '       if ( doc )' +
+                                                                '       {' +
+                                                                '               doc.$.designMode = "off";' +
+                                                                '               doc.$.designMode = "on";' +
+                                                                '       }' +
+                                                                '}' +
+                                                '})();' );
                         }
                 } )();