Ticket #2922: 2922.patch

_source/core/editor.js

@@ -149 +149 @@
                                 // files to get loaded.
                                 for ( var pluginName in plugins )
                                 {
-                                        var plugin = plugins[ pluginName ],
-                                                pluginLangs = plugin.lang,
+                                        var plugin = plugins[ pluginName ];
+
+                                        // Bypass those without definiton. 
+                                        if( !plugin )
+                                                continue;
+                                        
+                                        var pluginLangs = plugin.lang,
                                                 pluginPath = CKEDITOR.plugins.getPath( pluginName ),
                                                 lang = null;
 
@@ -194 +199 @@
                                                         for ( var i = 0 ; i < pluginsArray.length ; i++ )
                                                         {
                                                                 var plugin = pluginsArray[ i ];
+                                                                
+                                                                // Bypass those without definiton.
+                                                                if( !plugin )
+                                                                        continue;
 
                                                                 // Uses the first loop to update the language entries also.
                                                                 if ( m === 0 && languageCodes[ i ] && plugin.lang )
@@ -199 +208 @@
                                                                 if ( m === 0 && languageCodes[ i ] && plugin.lang )
                                                                         CKEDITOR.tools.extend( editor.lang, plugin.lang[ languageCodes[ i ] ] );
 
-                                                                // Call the plugin method (beforeInit and init).
-                                                                if ( plugin[ methods[ m ] ] )
+                                                                // Call the plugin method (beforeInit and init) unless it's failed in loading.
+                                                                if ( !plugin._failed && plugin[ methods[ m ] ] )
                                                                         plugin[ methods[ m ] ]( editor );
                                                         }
                                                 }

_source/core/resourcemanager.js

@@ -206 +206 @@
                                 resources[ name ] = this.get( name );
                 }
 
-                CKEDITOR.scriptLoader.load( urls, function( completed, failed )
+                CKEDITOR.scriptLoader.load( urls, function( completed, faileds )
                         {
-                                if ( failed.length )
+                                if( faileds.length )
                                 {
-                                        throw '[CKEDITOR.resourceManager.load] Resource name "' + urlsNames[ failed[ 0 ] ].join( ',' )
-                                                + '" was not found at "' + failed[ 0 ] + '".';
+                                        var failedNames = [];
+                                        for ( var i = 0; i < faileds.length; i++ )
+                                        {
+                                                var names = urlsNames[ faileds[ i ] ];
+                                                for ( var j = 0; j < names.length; j++ )
+                                                        failedNames.push(  names[ j ] );
+                                        }
                                 }
-
-                                for ( var i = 0 ; i < completed.length ; i++ )
+                                for ( i = 0 ; i < completed.length ; i++ )
                                 {
                                         var nameList = urlsNames[ completed[ i ] ];
-                                        for ( var j = 0 ; j < nameList.length ; j++ )
+                                        for ( j = 0 ; j < nameList.length ; j++ )
                                         {
                                                 var name = nameList[ j ];
                                                 resources[ name ] = this.get( name );
@@ -226 +230 @@
                                         }
                                 }
 
-                                callback.call( scope, resources );
+                                callback.call( scope, resources, failedNames );
                         }
                         , this);
         }

_source/core/plugins.js

@@ -24 +24 @@
         {
                 return function( name, callback, scope )
                 {
-                        var allPlugins = {};
+                        var allPlugins = {}, failedPlugins = {};
 
                         var loadPlugins = function( names )
                         {
-                                originalLoad.call( this, names, function( plugins )
+                                originalLoad.call( this, names, function( plugins , faileds )
                                         {
+                                                // Record failed plugin names on each load.
+                                                if( faileds && faileds.length )
+                                                {
+                                                        for (var i = 0; i < faileds.length; i++ )
+                                                        {
+                                                                failedPlugins[ faileds [ i ] ] = 1;
+                                                        }
+                                                }
+                                                        
                                                 CKEDITOR.tools.extend( allPlugins, plugins );
-
+                                                
                                                 var requiredPlugins = [];
                                                 for ( var pluginName in plugins )
                                                 {
@@ -40 +49 @@
 
                                                         if ( requires )
                                                         {
-                                                                for ( var i = 0 ; i < requires.length ; i++ )
+                                                                for ( i = 0 ; i < requires.length ; i++ )
                                                                 {
                                                                         if ( !allPlugins[ requires[ i ] ] )
                                                                                 requiredPlugins.push( requires[ i ] );
@@ -56 +65 @@
                                                         for ( pluginName in allPlugins )
                                                         {
                                                                 plugin = allPlugins[ pluginName ];
-                                                                if ( plugin.onLoad && !plugin.onLoad._called )
+                                                                
+                                                                // Bypass those without definiton. 
+                                                                if( !plugin )
+                                                                        continue;
+                                                                        
+                                                                if( plugin.requires )
+                                                                {
+                                                                        // Mark those plugins which depend on failed ones as failed also. 
+                                                                        for ( var j = 0; j< plugin.requires.length; j++ )
+                                                                                if ( plugin.requires[ j ] in failedPlugins )
+                                                                                                plugin._failed = true;
+                                                                }
+                                                                                        
+                                                                if ( plugin.onLoad && !plugin.onLoad._called && !plugin._failed )
                                                                 {
                                                                         plugin.onLoad();
                                                                         plugin.onLoad._called = 1;