Make the kitchensink button removable from plugins (#10964)

WordPress · Nov 9, 2018 · b814d88 · b814d88
1 parent b9c909f
commit b814d88
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/lib/client-assets.php b/lib/client-assets.php
@@ -598,28 +598,26 @@ function gutenberg_register_scripts_and_styles() {
 			),
 			'toolbar1'         => implode(
 				',',
-				array_merge(
-					apply_filters(
-						'mce_buttons',
-						array(
-							'formatselect',
-							'bold',
-							'italic',
-							'bullist',
-							'numlist',
-							'blockquote',
-							'alignleft',
-							'aligncenter',
-							'alignright',
-							'link',
-							'unlink',
-							'wp_more',
-							'spellchecker',
-							'wp_add_media',
-						),
-						'editor'
+				apply_filters(
+					'mce_buttons',
+					array(
+						'formatselect',
+						'bold',
+						'italic',
+						'bullist',
+						'numlist',
+						'blockquote',
+						'alignleft',
+						'aligncenter',
+						'alignright',
+						'link',
+						'unlink',
+						'wp_more',
+						'spellchecker',
+						'wp_add_media',
+						'kitchensink',
 					),
-					array( 'kitchensink' )
+					'editor'
 				)
 			),
 			'toolbar2'         => implode(

diff --git a/packages/block-library/src/classic/edit.js b/packages/block-library/src/classic/edit.js
@@ -115,6 +115,7 @@ export default class ClassicEdit extends Component {
 			}
 		} );
 
+		// TODO: the following is for back-compat with WP 4.9, not needed in WP 5.0. Remove it after the release.
 		editor.addButton( 'kitchensink', {
 			tooltip: _x( 'More', 'button to expand options' ),
 			icon: 'dashicon dashicons-editor-kitchensink',
@@ -127,11 +128,19 @@ export default class ClassicEdit extends Component {
 			},
 		} );
 
+		// Show the second, third, etc. toolbars when the `kitchensink` button is removed by a plugin.
+		editor.on( 'init', function() {
+			if ( editor.settings.toolbar1 && editor.settings.toolbar1.indexOf( 'kitchensink' ) === -1 ) {
+				editor.dom.addClass( ref, 'has-advanced-toolbar' );
+			}
+		} );
+
 		editor.addButton( 'wp_add_media', {
 			tooltip: __( 'Insert Media' ),
 			icon: 'dashicon dashicons-admin-media',
 			cmd: 'WP_Medialib',
 		} );
+		// End TODO.
 
 		editor.on( 'init', () => {
 			const rootNode = this.editor.getBody();