Ticket #3430: 3430.patch

_source/core/config.js

@@ -153 +153 @@
         plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,preview,print,removeformat,save,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**
+         * List of additional plugins to be loaded. This is a tool setting which
+         * makes it easier to add new plugins, whithout having to touch and
+         * possibly breaking the <i>plugins</i> setting.
+         * @type String
+         * @example
+         * config.addPlugins = 'myplugin,anotherplugin';
+         */
+        addPlugins : '',
+
+        /**
+         * List of plugins that must not be loaded. This is a tool setting which
+         * makes it easier to avoid loading plugins definied in the <i>plugins</i>
+         * setting, whithout having to touch and possibly breaking it.
+         * @type String
+         * @example
+         * config.removePlugins = 'elementspath,save,font';
+         */
+        removePlugins : '',
+
+        /**
          * The editor tabindex value.
          * @type Number
          * @default 0 (zero)

_source/core/editor.js

@@ -35 +35 @@
 
                 var loadedConfig = loadConfigLoaded[ customConfig ] || ( loadConfigLoaded[ customConfig ] = {} );
 
-
                 // If the custom config has already been downloaded, reuse it.
                 if ( loadedConfig.fn )
                 {
@@ -149 +148 @@
 
         var loadPlugins = function( editor )
         {
+                var config                      = editor.config,
+                        plugins                 = config.plugins,
+                        addPlugins              = config.addPlugins,
+                        removePlugins   = config.removePlugins;
+
+                if ( addPlugins )
+                {
+                        // Remove them first to avoid duplications.
+                        var removeRegex = new RegExp( '(?:^|,)(?:' + addPlugins.replace( /\s*,\s*/g, '|' ) + ')(?=,|$)' , 'g' );
+                        plugins = plugins.replace( removeRegex, '' );
+
+                        plugins += ',' + addPlugins;
+                }
+
+                if ( removePlugins )
+                {
+                        removeRegex = new RegExp( '(?:^|,)(?:' + removePlugins.replace( /\s*,\s*/g, '|' ) + ')(?=,|$)' , 'g' );
+                        plugins = plugins.replace( removeRegex, '' );
+                }
+
                 // Load all plugins defined in the "plugins" setting.
-                CKEDITOR.plugins.load( editor.config.plugins.split( ',' ), function( plugins )
+                CKEDITOR.plugins.load( plugins.split( ',' ), function( plugins )
                         {
                                 // The list of plugins.
                                 var pluginsArray = [];