<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[43889] branches/5.0/src/wp-includes: Block Editor: Fix the TinyMCE `wordpress` plugin to handle hiding/showing of toolbars in the classic block.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/43889">43889</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/43889","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-11-12 10:34:50 +0000 (Mon, 12 Nov 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Block Editor: Fix the TinyMCE `wordpress` plugin to handle hiding/showing of toolbars in the classic block. Change the classic block toolbar to use the (now fixed) `wp_adv` button.
Fixes <a href="https://core.trac.wordpress.org/ticket/45264">#45264</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches50srcwpincludescsseditorcss">branches/5.0/src/wp-includes/css/editor.css</a></li>
<li><a href="#branches50srcwpincludesjstinymcepluginswordpresspluginjs">branches/5.0/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#branches50srcwpincludesscriptloaderphp">branches/5.0/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches50srcwpincludescsseditorcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/css/editor.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/css/editor.css 2018-11-12 10:02:25 UTC (rev 43888)
+++ branches/5.0/src/wp-includes/css/editor.css 2018-11-12 10:34:50 UTC (rev 43889)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,6 +361,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* 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;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> div.mce-statusbar {
</span><span class="cx" style="display: block; padding: 0 10px"> border-top: 1px solid #e5e5e5;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches50srcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2018-11-12 10:02:25 UTC (rev 43888)
+++ branches/5.0/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2018-11-12 10:34:50 UTC (rev 43889)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,46 +20,50 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function toggleToolbars( state ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var iframe, initial, toolbars,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- pixels = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pixels = 0,
+ classicBlockToolbar = tinymce.$( '.block-library-classic__toolbar' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- initial = ( state === 'hide' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( editor.theme.panel ) {
</span><span class="cx" style="display: block; padding: 0 10px"> toolbars = editor.theme.panel.find('.toolbar:not(.menubar)');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! toolbars || toolbars.length < 2 || ( state === 'hide' && ! toolbars[1].visible() ) ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
+ }
+ }
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! state && toolbars[1].visible() ) {
- state = 'hide';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! initial ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( state === 'hide' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setUserSetting('hidetb', '0');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setUserSetting( 'hidetb', '0' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpAdvButton && wpAdvButton.active( false );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setUserSetting('hidetb', '1');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setUserSetting( 'hidetb', '1' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpAdvButton && wpAdvButton.active( true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> cmd: 'WP_Adv',
</span><span class="cx" style="display: block; padding: 0 10px"> onPostRender: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> wpAdvButton = this;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' ? true : false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,6 +85,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'PostRender', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( editor.getParam( 'wordpress_adv_hidden', true ) && getUserSetting( 'hidetb', '0' ) === '0' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> toggleToolbars( 'hide' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ tinymce.$( '.block-library-classic__toolbar' ).addClass( 'has-advanced-toolbar' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,9 +432,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> stateSelector: 'code'
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Menubar
</del><span class="cx" style="display: block; padding: 0 10px"> // Insert->Add Media
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp && wp.media && wp.media.editor ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.addButton( 'wp_add_media', {
+ tooltip: 'Add Media',
+ icon: 'dashicon dashicons-admin-media',
+ cmd: 'WP_Medialib',
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.addMenuItem( 'add_media', {
</span><span class="cx" style="display: block; padding: 0 10px"> text: 'Add Media',
</span><span class="cx" style="display: block; padding: 0 10px"> icon: 'wp-media-library',
</span></span></pre></div>
<a id="branches50srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/script-loader.php 2018-11-12 10:02:25 UTC (rev 43888)
+++ branches/5.0/src/wp-includes/script-loader.php 2018-11-12 10:34:50 UTC (rev 43889)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_more',
</span><span class="cx" style="display: block; padding: 0 10px"> 'spellchecker',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_add_media',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'kitchensink',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_adv',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* This filter is documented in wp-includes/class-wp-editor.php */
</span></span></pre>
</div>
</div>
</body>
</html>