Ticket #5774: 5774.patch

_source/core/dom/domobject.js

@@ -8 +8 @@
  *              for other classes representing DOM objects.
  */
 
-/**
- * Represents a DOM object. This class is not intended to be used directly. It
- * serves as the base class for other classes representing specific DOM
- * objects.
- * @constructor
- * @param {Object} nativeDomObject A native DOM object.
- * @augments CKEDITOR.event
- * @example
- */
-CKEDITOR.dom.domObject = function( nativeDomObject )
-{
-        if ( nativeDomObject )
-        {
-                /**
-                 * The native DOM object represented by this class instance.
-                 * @type Object
-                 * @example
-                 * var element = new CKEDITOR.dom.element( 'span' );
-                 * alert( element.$.nodeType );  // "1"
-                 */
-                this.$ = nativeDomObject;
-        }
-};
+( function()
+{
+        // Prevent IE6 from leaking in-page elements, we have to break
+        // references to native DOM elements.
+        if ( CKEDITOR.env.ie && CKEDITOR.env.version < 7 )
+        {
+                var domObjects = [];
+                CKEDITOR.on( 'reset', function()
+                {
+                        for ( var i = 0, length = domObjects.length; i < length; i++ )
+                                delete domObjects[ i ].$;
+                });
+        }
+
+        /**
+         * Represents a DOM object. This class is not intended to be used directly. It
+         * serves as the base class for other classes representing specific DOM
+         * objects.
+         * @constructor
+         * @param {Object} nativeDomObject A native DOM object.
+         * @augments CKEDITOR.event
+         * @example
+         */
+        CKEDITOR.dom.domObject = function( nativeDomObject )
+        {
+                if ( nativeDomObject )
+                {
+                        /**
+                         * The native DOM object represented by this class instance.
+                         * @type Object
+                         * @example
+                         * var element = new CKEDITOR.dom.element( 'span' );
+                         * alert( element.$.nodeType );  // "1"
+                         */
+                        this.$ = nativeDomObject;
+                        if ( CKEDITOR.env.ie && CKEDITOR.env.version < 7 )
+                                domObjects.push( this );
+                }
+        };
 
+} )();
+
 CKEDITOR.dom.domObject.prototype = (function()
 {
         // Do not define other local variables here. We want to keep the native

_source/core/ckeditor_basic.js

@@ -232 +232 @@
                                 }
                         };
 
+                        function unload()
+                        {
+                                // Allow page-off cleanup to happen,
+                                // mainly for protect memory leaks. 
+                                CKEDITOR.fire( 'reset' );
+
+                                // Detach unload function
+                                if ( window.detachEvent )
+                                {
+                                        window.detachEvent( 'onbeforeunload', beforeUnload );
+                                        window.detachEvent( 'onunload', unload );
+                                } else if ( window.removeEventListener )
+                                        window.removeEventListener( 'unload', unload, false );
+
+                                // Destroy references
+                                unload = null;
+                        }
+
+                        function beforeUnload()
+                        {
+                                var doc = document;
+
+                                // The document may still in loading,
+                                //  in this case the 'unload' even won't fire at all,
+                                // we have look to for the 'stop' event instead.
+                                if ( doc.readyState == 'interactive' )
+                                {
+                                        function stop()
+                                        {
+                                                // Prevent memory leak
+                                                doc.detachEvent( 'onstop', stop );
+
+                                                // Call unload handler
+                                                if ( unload )
+                                                        unload();
+
+                                                doc = null;
+                                        }
+
+                                        // Fire unload when the currently loading page is stopped
+                                        if ( doc )
+                                                doc.attachEvent( 'onstop', stop );
+
+                                        // Remove onstop listener after a while to prevent the unload function
+                                        // to execute if the user presses cancel in an onbeforeunload
+                                        // confirm dialog and then presses the browser stop button
+                                        window.setTimeout( function()
+                                        {
+                                                if ( doc )
+                                                        doc.detachEvent( 'onstop', stop );
+                                        }, 0 );
+                                }
+                        }
+
                         if ( window.addEventListener )
                                 window.addEventListener( 'load', onload, false );
                         else if ( window.attachEvent )
                                 window.attachEvent( 'onload', onload );
+
+                        if ( window.attachEvent )
+                        {
+                                window.attachEvent( 'onunload', unload );
+                                window.attachEvent( 'onbeforeunload', beforeUnload );
+                        } 
+                        else if ( window.addEventListener )
+                                window.addEventListener( 'unload', unload, false );
+
                 })();
 
                 CKEDITOR.status = 'basic_loaded';

_source/core/dom/document.js

@@ -164 +164 @@
                  */
                 getHead : function()
                 {
-                        var head = this.$.getElementsByTagName( 'head' )[0];
-                        head = new CKEDITOR.dom.element( head );
-
-                        return (
-                        this.getHead = function()
-                                {
-                                        return head;
-                                })();
+                        return this.getElementsByTag( 'head' ).getItem( 0 );
                 },
 
                 /**
@@ -183 +176 @@
                  */
                 getBody : function()
                 {
-                        var body = new CKEDITOR.dom.element( this.$.body );
-
-                        return (
-                        this.getBody = function()
-                                {
-                                        return body;
-                                })();
+                        return new CKEDITOR.dom.element( this.$.body );
                 },
 
                 /**