Ticket #6504: 6504_1.patch

_source/core/editor.js

@@ -52 +52 @@
                 else
                 {
                         // Load the custom configuration file.
-                        CKEDITOR.scriptLoader.load( customConfig, function()
+                        CKEDITOR.scriptLoader.queue( customConfig, function()
                                 {
                                         // If the CKEDITOR.editorConfig function has been properly
                                         // defined in the custom configuration file, cache it.

_source/core/scriptloader.js

@@ -15 +15 @@
  */
 CKEDITOR.scriptLoader = (function()
 {
-        var uniqueScripts = {},
-                waitingList = {};
+        var uniqueScripts = {}, 
+                waitingList = {}, 
+                pendingQueue = [];
 
         return /** @lends CKEDITOR.scriptLoader */ {
                 /**
@@ -35 +36 @@
                  *              the callback call. Default to {@link CKEDITOR}.
                  * @param {Boolean} [showBusy] Changes the cursor of the document while
 +                *              the script is loaded.
+                 * @param {Boolean} [ordered] Signals that the script is part of a queue.
                  * @example
                  * CKEDITOR.scriptLoader.load( '/myscript.js' );
                  * @example
@@ -51 +53 @@
                  *         alert( 'Number of failures: ' + failed.length );
                  *     });
                  */
-                load : function( scriptUrl, callback, scope, showBusy )
+                load : function( scriptUrl, callback, scope, showBusy, ordered )
                 {
                         var isString = ( typeof scriptUrl == 'string' );
 
@@ -106 +108 @@
                                 for ( var i = 0 ; i < waitingInfo.length ; i++ )
                                         waitingInfo[ i ]( url, success );
                         };
+                        
+                        if ( ordered ) 
+                    CKEDITOR.scriptLoader.advanceQueue(); 
 
                         var loadScript = function( url )
                         {
@@ -175 +180 @@
                         {
                                 loadScript( scriptUrl[ i ] );
                         }
-                }
+                },
+                
+                /** 
+                 * Loads a script in a queue, so only one of the scripts in the queue is 
+                 * to be loaded at the same time. 
+                 * @param {String|Array} scriptUrl One or more URLs pointing to the 
+                 *              scripts to be loaded. 
+                 * @param {Function} [callback] A function to be called when the script 
+                 *              is loaded and executed. If a string is passed to "scriptUrl", a 
+                 *              boolean parameter is passed to the callback, indicating the 
+                 *              success of the load. If an array is passed instead, two array 
+                 *              parameters are passed to the callback; the first contains the 
+                 *              URLs that have been properly loaded, and the second the failed 
+                 *              ones. 
+                 * @example 
+                 * see CKEDITOR.scriptLoader.load 
+                 * 
+                 */ 
+                queue : function( scriptUrl, callback ) 
+                { 
+                        // Let's add this script to the queue 
+                        pendingQueue.push( {'url': scriptUrl, 'callback': callback} ); 
+        
+                        // Load it if it's the only one in the queue at the moment 
+                        if ( pendingQueue.length == 1 ) 
+                                this.load( scriptUrl, callback, CKEDITOR, 0, 1); 
+                }, 
+        
+                advanceQueue : function() 
+                { 
+                        // Remove the first one 
+                        pendingQueue.shift(); 
+                
+                        // Load the new one that it's first 
+                        if ( pendingQueue.length ) 
+                                this.load( pendingQueue[0].url, pendingQueue[0].callback, CKEDITOR, 0, 1); 
+                } 
         };
 })();