Ticket #2906: 2906.patch

_source/core/resourcemanager.js

@@ -115 +115 @@
 
         /**
          * Registers a resource to be loaded from an external path instead of the core base path.
-         * @param {String} name The resource name.
+         * @param {String} names The resource names, separated by commas.
          * @param {String} path The resource external path.
          * @example
          * // Loads a plugin from '/myplugin/samples/plugin.js'.
          * CKEDITOR.plugins.addExternal( 'sample', '/myplugins/sample/' );
          */
-        addExternal : function( name, path )
+        addExternal : function( names, path )
         {
-                if ( this.registered[ name ] || this.externals[ name ] )
-                        throw '[CKEDITOR.resourceManager.import] The resource name "' + name + '" is already registered or imported.';
+                names = names.split( ',' );
+                for ( var i = 0 ; i < names.length ; i++ )
+                {
+                        var name = names[ i ];
+                        if ( this.registered[ name ] || this.externals[ name ] )
+                                throw '[CKEDITOR.resourceManager.import] The resource name "' + name + '" is already registered or imported.';
 
-                this.externals[ name ] = path;
+                        this.externals[ name ] = path;
+                }
         },
 
         /**
@@ -169 +174 @@
                         {
                                 var url = CKEDITOR.getUrl( this.getPath( name ) + this.fileName + '.js' );
                                 urls.push( url );
-                                urlsNames[ url ] = name;
+                                if ( !( url in urlsNames ) )
+                                        urlsNames[ url ] = [];
+                                urlsNames[ url ].push( name );
                         }
                         else
                                 resources[ name ] = this.get( name );
@@ -178 +185 @@
                 CKEDITOR.scriptLoader.load( urls, function( completed, failed )
                         {
                                 if ( failed.length )
-                                        throw '[CKEDITOR.resourceManager.load] Resource name "' + urlsNames[ failed[ 0 ] ] + '" was not found at "' + failed[ 0 ] + '".';
+                                {
+                                        throw '[CKEDITOR.resourceManager.load] Resource name "' + urlsNames[ failed[ 0 ] ].join( ',' )
+                                                + '" was not found at "' + failed[ 0 ] + '".';
+                                }
 
                                 for ( var i = 0 ; i < completed.length ; i++ )
                                 {
-                                        var name = urlsNames[ completed[ i ] ];
-                                        resources[ name ] = this.get( name );
+                                        var nameList = urlsNames[ completed[ i ] ];
+                                        for ( var j = 0 ; j < nameList.length ; j++ )
+                                        {
+                                                var name = nameList[ j ];
+                                                resources[ name ] = this.get( name );
 
-                                        loaded[ name ] = 1;
+                                                loaded[ name ] = 1;
+                                        }
                                 }
 
                                 callback.call( scope, resources );

config.js

@@ -8 +8 @@
         // Define changes to default configuration here. For example:
         // config.autoLanguage = false;
         // config.defaultLanguage = 'pt-br';
+
+        CKEDITOR.plugins.addExternal( 'api_dialog,api_dialog2,api_dialog3','file:///C:/external_plugin/');
+
+        // Append the "peopletools" plugin to the list of plugins
+        // to be loaded.
+        config.plugins += ',api_dialog,api_dialog2';
 };