Ticket #6504: 6504.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 = {};
-        var waitingList = {};
+        var uniqueScripts = {},
+                waitingList = {},
+                pendingQueue = [];
 
         return /** @lends CKEDITOR.scriptLoader */ {
                 /**
@@ -35 +36 @@
                  *              the callback call. Default to {@link CKEDITOR}.
                  * @param {Boolean} [noCheck] Indicates that the script must be loaded
                  *              anyway, not checking if it has already loaded.
+                 * @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 +55 @@
                  *         alert( 'Number of failures: ' + failed.length );
                  *     });
                  */
-                load : function( scriptUrl, callback, scope, noCheck, showBusy )
+                load : function( scriptUrl, callback, scope, noCheck, showBusy, ordered )
                 {
                         var isString = ( typeof scriptUrl == 'string' );
 
@@ -91 +95 @@
                                         showBusy && CKEDITOR.document.getDocumentElement().removeStyle( 'cursor' );
                                         doCallback( success );
                                 }
+
+                                if ( ordered )
+                                        CKEDITOR.scriptLoader.advanceQueue();
                         };
 
                         var onLoad = function( url, success )
@@ -178 +185 @@
                 },
 
                 /**
+                 * 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, 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, 0, 1);
+                },
+
+                /**
                  * Executes a JavaScript code into the current document.
                  * @param {String} code The code to be executed.
                  * @example