Merge branch 't/13494'

ckeditor · Jul 21, 2015 · 894c103 · 894c103
2 parents f79b703 + 0d99696
commit 894c103
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -20,6 +20,7 @@ Fixed Issues:
 * [#13184](http://dev.ckeditor.com/ticket/13184): Fixed: Web page reloaded after drop on editor UI.
 * [#13410](http://dev.ckeditor.com/ticket/13410): Fixed: Error thrown in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin when undoing right after pasting a link.
 * [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost while opening the panel.
+* [#13494](http://dev.ckeditor.com/ticket/13494): Fixed: Error thrown in toolbar configurator if plugin requirements are unsatisfied.
 
 ## CKEditor 4.5.1
 

diff --git a/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js b/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
@@ -558,13 +558,9 @@ if ( !Object.keys ) {
 	 * @static
 	 */
 	AbstractToolbarModifier.extendPluginsConfig = function( config ) {
-		var extraPlugins = config.extraPlugins,
-			removePlugins = config.removePlugins;
+		var extraPlugins = config.extraPlugins;
 
 		// Enable the special, lightweight area to replace wysiwygarea.
 		config.extraPlugins = ( extraPlugins ? extraPlugins + ',' : '' ) + 'toolbarconfiguratorarea';
-		// Disable plugins which do not affect toolbar buttons, to make the editor more lightweight.
-		config.removePlugins = ( removePlugins ? removePlugins + ',' : '' ) +
-			'autogrow,dialogadvtab,elementspath,enterkey,floatingspace,htmlwriter,magicline,resize,sharedspace,tab,wysiwygarea';
 	};
 } )();