Ticket #45264: 45264.3.diff

src/wp-includes/css/editor.css

@@ -361 +361 @@
         margin: 0;
 }
 
+/* Classic block hide/show toolbars */
+.block-library-classic__toolbar .mce-toolbar-grp .mce-toolbar:not(:first-child) {
+        display: none;
+}
+
+.block-library-classic__toolbar.has-advanced-toolbar .mce-toolbar-grp .mce-toolbar {
+        display: block;
+}
+
 div.mce-statusbar {
         border-top: 1px solid #e5e5e5;
 }

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -20 +20 @@
 
         function toggleToolbars( state ) {
                 var iframe, initial, toolbars,
-                        pixels = 0;
+                        pixels = 0,
+                        classicBlockToolbar = tinymce.$( '.block-library-classic__toolbar' );
 
-                initial = ( state === 'hide' );
+                if ( state === 'hide' ) {
+                        initial = true;
+                } else if ( classicBlockToolbar.length && ! classicBlockToolbar.hasClass( 'has-advanced-toolbar' ) ) {
+                        // Show the second, third, etc. toolbar rows in the Classic block instance.
+                        classicBlockToolbar.addClass( 'has-advanced-toolbar' );
+                        state = 'show';
+                }
 
                 if ( editor.theme.panel ) {
                         toolbars = editor.theme.panel.find('.toolbar:not(.menubar)');
                 }
 
-                if ( ! toolbars || toolbars.length < 2 || ( state === 'hide' && ! toolbars[1].visible() ) ) {
-                        return;
+                if ( toolbars && toolbars.length > 1 ) {
+                        if ( ! state && toolbars[1].visible() ) {
+                                state = 'hide';
+                        }
+
+                        each( toolbars, function( toolbar, i ) {
+                                if ( i > 0 ) {
+                                        if ( state === 'hide' ) {
+                                                toolbar.hide();
+                                                pixels += 30;
+                                        } else {
+                                                toolbar.show();
+                                                pixels -= 30;
+                                        }
+                                }
+                        });
                 }
 
-                if ( ! state && toolbars[1].visible() ) {
-                        state = 'hide';
+                // Resize editor iframe, not needed for iOS and inline instances.
+                if ( pixels && ! tinymce.Env.iOS && editor.iframeElement ) {
+                        DOM.setStyle( editor.iframeElement, 'height', editor.iframeElement.clientHeight + pixels );
                 }
 
-                each( toolbars, function( toolbar, i ) {
-                        if ( i > 0 ) {
-                                if ( state === 'hide' ) {
-                                        toolbar.hide();
-                                        pixels += 30;
-                                } else {
-                                        toolbar.show();
-                                        pixels -= 30;
-                                }
-                        }
-                });
-
-                if ( pixels && ! initial ) {
-                        // Resize iframe, not needed in iOS
-                        if ( ! tinymce.Env.iOS ) {
-                                iframe = editor.getContentAreaContainer().firstChild;
-                                DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels );
-                        }
-
+                if ( ! initial ) {
                         if ( state === 'hide' ) {
-                                setUserSetting('hidetb', '0');
+                                setUserSetting( 'hidetb', '0' );
                                 wpAdvButton && wpAdvButton.active( false );
                         } else {
-                                setUserSetting('hidetb', '1');
+                                setUserSetting( 'hidetb', '1' );
                                 wpAdvButton && wpAdvButton.active( true );
                         }
                 }
@@ -73 +77 @@
                 cmd: 'WP_Adv',
                 onPostRender: function() {
                         wpAdvButton = this;
-                        wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' ? true : false );
+                        wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' );
                 }
         });
 
@@ -81 +85 @@
         editor.on( 'PostRender', function() {
                 if ( editor.getParam( 'wordpress_adv_hidden', true ) && getUserSetting( 'hidetb', '0' ) === '0' ) {
                         toggleToolbars( 'hide' );
+                } else {
+                        tinymce.$( '.block-library-classic__toolbar' ).addClass( 'has-advanced-toolbar' );
                 }
         });
 
@@ -426 +432 @@
                 stateSelector: 'code'
         });
 
-        // Menubar
         // Insert->Add Media
         if ( wp && wp.media && wp.media.editor ) {
+                editor.addButton( 'wp_add_media', {
+                        tooltip: 'Add Media',
+                        icon: 'dashicon dashicons-admin-media',
+                        cmd: 'WP_Medialib',
+                } );
+
                 editor.addMenuItem( 'add_media', {
                         text: 'Add Media',
                         icon: 'wp-media-library',

src/wp-includes/script-loader.php

@@ -504 +504 @@
                 'wp_more',
                 'spellchecker',
                 'wp_add_media',
-                'kitchensink',
+                'wp_adv',
         );
 
         /* This filter is documented in wp-includes/class-wp-editor.php */