Ticket #4145: 4145.patch

_source/core/loader.js

@@ -123 +123 @@
                                 't=' + timestamp;
                 };
 
+                var pendingLoad = [];
+
                 /** @lends CKEDITOR.loader */
                 return {
                         /**
@@ -133 +135 @@
                          * alert( <b>CKEDITOR.loader.loadedScripts</b> );
                          */
                         loadedScripts : [],
+                        
+                        loadPending : function()
+                        {
+                                var scriptName = pendingLoad.shift();
+                                
+                                if ( !scriptName )
+                                        return;
 
+                                var scriptSrc = getUrl( '_source/' + scriptName + '.js' );
+
+                                var script = document.createElement( 'script' );
+                                script.type = 'text/javascript';
+                                script.src = scriptSrc;
+
+                                function onScriptLoaded()
+                                {
+                                        // Append this script to the list of loaded scripts.
+                                        CKEDITOR.loader.loadedScripts.push( scriptName );
+                                        
+                                        // Load the next.
+                                        CKEDITOR.loader.loadPending();
+                                }
+
+                                // 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 )
+                                {
+                                        /** @ignore */
+                                        script.onreadystatechange = function()
+                                        {
+                                                if ( script.readyState == 'loaded' || script.readyState == 'complete' )
+                                                {
+                                                        script.onreadystatechange = null;
+                                                        onScriptLoaded();
+                                                }
+                                        };
+                                }
+                                else
+                                {
+                                        /** @ignore */
+                                        script.onload = function()
+                                        {
+                                                // Some browsers, such as Safari, may call the onLoad function
+                                                // immediately. Which will break the loading sequence. (#3661)
+                                                setTimeout( function() { onScriptLoaded( scriptName ); }, 0 );
+                                        };
+                                }
+
+                                document.body.appendChild( script );
+                        },
+
                         /**
                          * Loads a specific script, including its dependencies. This is not a
                          * synchronous loading, which means that the code the be loaded will
@@ -141 +194 @@
                          * @example
                          * CKEDITOR.loader.load( 'core/dom/element' );
                          */
-                        load : function( scriptName )
+                        load : function( scriptName, defer )
                         {
                                 // Check if the script has already been loaded.
                                 if ( scriptName in this.loadedScripts )
@@ -158 +211 @@
 
                                 // Load all dependencies first.
                                 for ( var i = 0 ; i < dependencies.length ; i++ )
-                                        this.load( dependencies[ i ] );
-
-                                // Append this script to the list of loaded scripts.
-                                this.loadedScripts.push( scriptName );
-
+                                        this.load( dependencies[ i ], true );
+                                
                                 var scriptSrc = getUrl( '_source/' + scriptName + '.js' );
 
                                 // Append the <script> element to the DOM.
                                 if ( document.body )
                                 {
-                                        var script = document.createElement( 'script' );
-                                        script.type = 'text/javascript';
-                                        script.src = scriptSrc;
+                                        pendingLoad.push( scriptName );
 
-                                        document.body.appendChild( script );
+                                        if ( !defer )
+                                                this.loadPending();
                                 }
                                 else
                                         document.write( '<script src="' + scriptSrc + '" type="text/javascript"><\/script>' );

_source/tests/core/bootstrap.html

@@ -12 +12 @@
 
 var before_loadFullCore = CKEDITOR.status;
 
+var isLoaded;
+
+CKEDITOR.on( 'loaded', function()
+        {
+                isLoaded = true;
+        });
+
+
 CKEDITOR.loadFullCore();
 
         //]]>
@@ -32 +40 @@
 
                 test_status2 : function()
                 {
+                        // In IE, CKEDITOR.on( 'loaded' ) will be called immediately if the scripts are cached.
+                        if ( isLoaded )
+                                return;
+
                         var testCase = this;
                         CKEDITOR.on( 'loaded', function()
                                 {

CHANGES.html

@@ -213 +213 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4123">#4123</a> : Some dialog buttons were broken in IE7 quirks.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4122">#4122</a> : [IE] The image dialog 
                         was being rendered improperly when loading an image with long URL.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4145">#4145</a> : Fixed the on demand 
+                        (&quot;basic&quot;) loading model of the editor.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>