Ticket #4767: 4767_3.patch

_source/core/ckeditor_basic.js

@@ -231 +231 @@
                                 }
                         };
 
-                        if ( window.addEventListener )
-                                window.addEventListener( 'load', onload, false );
-                        else if ( window.attachEvent )
-                                window.attachEvent( 'onload', onload );
+                        // If the initialization is done by putting ckeditor_source.js in the body then
+                        // the scripts are loaded by setTimeout calls, so when it loads this one the document
+                        // might be already loaded
+                        // Unfortunately, Firefox <3.6 doesn't support document.readyState
+                        if (document.readyState == 'complete')
+                                setTimeout( onload, 0 );
+                        else
+                        {
+                                if ( window.addEventListener )
+                                        window.addEventListener( 'load', onload, false );
+                                else if ( window.attachEvent )
+                                        window.attachEvent( 'onload', onload );
+                        }
                 })();
 
                 CKEDITOR.status = 'basic_loaded';

_source/core/loader.js

@@ -161 +161 @@
 
                                 // We must guarantee the execution order of the scripts, so we
                                 // need to load them one by one. (#4145)
-                                // The followin if/else block has been taken from the scriptloader core code.
-                                if ( CKEDITOR.env.ie )
+                                // The following if/else block has been taken from the scriptloader core code.
+                                if ( typeof(script.onreadystatechange) !== "undefined" )
                                 {
                                         /** @ignore */
                                         script.onreadystatechange = function()
@@ -190 +190 @@
 
                         /**
                          * Loads a specific script, including its dependencies. This is not a
-                         * synchronous loading, which means that the code the be loaded will
+                         * synchronous loading, which means that the code to be loaded will
                          * not necessarily be available after this call.
                          * @example
                          * CKEDITOR.loader.load( 'core/dom/element' );
@@ -217 +217 @@
                                 var scriptSrc = getUrl( '_source/' + scriptName + '.js' );
 
                                 // Append the <script> element to the DOM.
-                                if ( document.body )
+                                // If the page is fully loaded, we can't use document.write
+                                // but if the script is run while the body is loading then it's safe to use it
+                                // Unfortunately, Firefox <3.6 doesn't support document.readyState, so it won't get this improvement
+                                if ( document.body && (!document.readyState || document.readyState == 'complete') )
                                 {
                                         pendingLoad.push( scriptName );
 

ckeditor_basic_source.js

@@ -15 +15 @@
 // Set the script name to be loaded by the loader.
 CKEDITOR._autoLoad = 'core/ckeditor_basic';
 
-// Include the loader script.
-document.write(
-        '<script type="text/javascript" src="' + CKEDITOR.getUrl( '_source/core/loader.js' ) + '"></script>' );
+(function() {
+        var src =  CKEDITOR.getUrl( '_source/core/loader.js' );
+        // Include the loader script.
+        if ( document.body && (!document.readyState || document.readyState == 'complete') )
+        {
+                var script = document.createElement( 'script' );
+                script.type = 'text/javascript';
+                script.src = src;
+
+                document.body.appendChild( script );
+        }
+        else
+                document.write(
+                        '<script type="text/javascript" src="' + src + '"></script>' );
+})();
+ No newline at end of file

ckeditor_source.js

@@ -12 +12 @@
 // request, having clear cache load of the editor code.
 // CKEDITOR.timestamp = ( new Date() ).valueOf();
 
-if ( CKEDITOR.loader )
-        CKEDITOR.loader.load( 'core/ckeditor' );
-else
-{
-        // Set the script name to be loaded by the loader.
-        CKEDITOR._autoLoad = 'core/ckeditor';
+(function() {
+        if ( CKEDITOR.loader )
+                CKEDITOR.loader.load( 'core/ckeditor' );
+        else
+        {
+                // Set the script name to be loaded by the loader.
+                CKEDITOR._autoLoad = 'core/ckeditor';
 
-        // Include the loader script.
-        document.write(
-                '<script type="text/javascript" src="' + CKEDITOR.getUrl( '_source/core/loader.js' ) + '"></script>' );
-}
+                var src =  CKEDITOR.getUrl( '_source/core/loader.js' );
+                // Include the loader script.
+                if ( document.body && (!document.readyState || document.readyState == 'complete') )
+                {
+                        var script = document.createElement( 'script' );
+                        script.type = 'text/javascript';
+                        script.src = src;
+
+                        document.body.appendChild( script );
+                }
+                else
+                        document.write(
+                                '<script type="text/javascript" src="' + src + '"></script>' );
+        }
+})();
+ No newline at end of file