Ticket #3661: 3661_debug.patch

_source/core/scriptloader.js

@@ -53 +53 @@
                  */
                 load : function( scriptUrl, callback, scope, noCheck )
                 {
+                        console.log( 'load ' + scriptUrl );
                         var isString = ( typeof scriptUrl == 'string' );
 
                         if ( isString )
@@ -84 +85 @@
 
                         var checkLoaded = function( url, success )
                         {
-                                ( success ? completed : failed).push( url );
+                                ( success ? completed : failed ).push( url );
 
                                 if ( --scriptCount <= 0 )
                                         doCallback( success );
+                                console.log( 'checkLoaded ' + url );
                         };
 
                         var onLoad = function( url, success )
                         {
+                                console.log( 'onLoad ' + url );
                                 // Mark this script as loaded.
                                 uniqueScripts[ url ] = 1;
 
@@ -102 +105 @@
                                 // Check all callbacks waiting for this file.
                                 for ( var i = 0 ; i < waitingInfo.length ; i++ )
                                         waitingInfo[ i ]( url, success );
+
+                                console.log( 'finished onLoad ' + url );
                         };
 
                         var loadScript = function( url )
@@ -121 +126 @@
 
                                 // Create the <script> element.
                                 var script = new CKEDITOR.dom.element( 'script' );
+
                                 script.setAttributes( {
                                         type : 'text/javascript',
                                         src : url } );
@@ -147 +153 @@
                                                 script.$.onload = function()
                                                 {
                                                         onLoad( url, true );
+                                                        // Some browsers, such as Safari, may call the onLoad function
+                                                        // immediately. Which will break the loading sequence. (#3661)
+                                                        // setTimeout( function() { onLoad( url, true ); }, 0 );
                                                 };
 
                                                 // FIXME: Opera and Safari will not fire onerror.
@@ -167 +176 @@
 
                         for ( var i = 0 ; i < scriptCount ; i++ )
                         {
+                                console.log( 'loadScript ' + scriptUrl[ i ] );
                                 loadScript( scriptUrl[ i ] );
+                                console.log( 'finished loadScript ' + scriptUrl[ i ] );
                         }
                 },