Skip to content
Permalink
Browse files

Merge branch 't/13173b' into major

  • Loading branch information...
Reinmar committed May 4, 2015
2 parents c0a9cef + 5c7af83 commit ba216e38b025e15c8a71f3e696549e15ae9be0c0
Showing with 2 additions and 1 deletion.
  1. +1 −0 CHANGES.md
  2. +1 −1 samples/toolbarconfigurator/js/toolbartextmodifier.js
@@ -11,6 +11,7 @@ Fixed Issues:
* [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.
* [#13136](http://dev.ckeditor.com/ticket/13136): Fixed: Autocompleter is far too intrusive.
* [#13133](http://dev.ckeditor.com/ticket/13133): Fixed: Tab leaves the editor.
* [#13173](http://dev.ckeditor.com/ticket/13173): Fixed: `config.removeButtons` is ignored by the advanced toolbar configurator.

## CKEditor 4.5 Beta

@@ -399,7 +399,7 @@

this._fixGroups( cfg );

cfg.toolbar = this._mapToolbarGroupsToToolbar( cfg.toolbarGroups );
cfg.toolbar = this._mapToolbarGroupsToToolbar( cfg.toolbarGroups, this.actualConfig.removeButtons );

this.actualConfig.toolbar = cfg.toolbar;
this.actualConfig.removeButtons = '';

0 comments on commit ba216e3

Please sign in to comment.
You can’t perform that action at this time.