<!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>[44236] trunk/src/wp-includes/script-loader.php: TinyMCE:</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/44236">44236</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/44236","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-16 20:23:57 +0000 (Sun, 16 Dec 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'>TinyMCE:
- Fix parsing of the init array in script-loader.
- Do not JSON encode the options object when outputting it from PHP.
- Remove JSON decoding of TinyMCE's `style_formats` option.
Props azaozz.
Merges <a href="https://core.trac.wordpress.org/changeset/43867">[43867]</a> to trunk.
Fixes <a href="https://core.trac.wordpress.org/ticket/45221">#45221</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2018-12-16 19:46:55 UTC (rev 44235)
+++ trunk/src/wp-includes/script-loader.php 2018-12-16 20:23:57 UTC (rev 44236)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,113 +461,118 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after'
</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">+ // TinyMCE init.
+ $tinymce_plugins = array(
+ 'charmap',
+ 'colorpicker',
+ 'hr',
+ 'lists',
+ 'media',
+ 'paste',
+ 'tabfocus',
+ 'textcolor',
+ 'fullscreen',
+ 'wordpress',
+ 'wpautoresize',
+ 'wpeditimage',
+ 'wpemoji',
+ 'wpgallery',
+ 'wplink',
+ 'wpdialogs',
+ 'wptextpattern',
+ 'wpview',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* This filter is documented in wp-includes/class-wp-editor.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tinymce_settings = apply_filters(
- 'tiny_mce_before_init',
- array(
- 'plugins' => implode(
- ',',
- array_unique(
- /* This filter is documented in wp-includes/class-wp-editor.php */
- apply_filters(
- 'tiny_mce_plugins',
- array(
- 'charmap',
- 'colorpicker',
- 'hr',
- 'lists',
- 'media',
- 'paste',
- 'tabfocus',
- 'textcolor',
- 'fullscreen',
- 'wordpress',
- 'wpautoresize',
- 'wpeditimage',
- 'wpemoji',
- 'wpgallery',
- 'wplink',
- 'wpdialogs',
- 'wptextpattern',
- 'wpview',
- )
- )
- )
- ),
- 'toolbar1' => implode(
- ',',
- array_merge(
- /* This filter is documented in wp-includes/class-wp-editor.php */
- apply_filters(
- 'mce_buttons',
- array(
- 'formatselect',
- 'bold',
- 'italic',
- 'bullist',
- 'numlist',
- 'blockquote',
- 'alignleft',
- 'aligncenter',
- 'alignright',
- 'link',
- 'unlink',
- 'wp_more',
- 'spellchecker',
- 'wp_add_media',
- ),
- 'editor'
- ),
- array( 'kitchensink' )
- )
- ),
- 'toolbar2' => implode(
- ',',
- /* This filter is documented in wp-includes/class-wp-editor.php */
- apply_filters(
- 'mce_buttons_2',
- array(
- 'strikethrough',
- 'hr',
- 'forecolor',
- 'pastetext',
- 'removeformat',
- 'charmap',
- 'outdent',
- 'indent',
- 'undo',
- 'redo',
- 'wp_help',
- ),
- 'editor'
- )
- ),
- /* This filter is documented in wp-includes/class-wp-editor.php */
- 'toolbar3' => implode( ',', apply_filters( 'mce_buttons_3', array(), 'editor' ) ),
- /* This filter is documented in wp-includes/class-wp-editor.php */
- 'toolbar4' => implode( ',', apply_filters( 'mce_buttons_4', array(), 'editor' ) ),
- /* This filter is documented in wp-includes/class-wp-editor.php */
- 'external_plugins' => apply_filters( 'mce_external_plugins', array() ),
- ),
- 'editor'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tinymce_plugins = apply_filters( 'tiny_mce_plugins', $tinymce_plugins, 'classic-block' );
+ $tinymce_plugins = array_unique( $tinymce_plugins );
+
+ $toolbar1 = array(
+ 'formatselect',
+ 'bold',
+ 'italic',
+ 'bullist',
+ 'numlist',
+ 'blockquote',
+ 'alignleft',
+ 'aligncenter',
+ 'alignright',
+ 'link',
+ 'unlink',
+ 'wp_more',
+ 'spellchecker',
+ 'wp_add_media',
+ 'kitchensink',
</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 ( isset( $tinymce_settings['style_formats'] ) && is_string( $tinymce_settings['style_formats'] ) ) {
- // Decode the options as we used to recommende json_encoding the TinyMCE settings.
- $tinymce_settings['style_formats'] = json_decode( $tinymce_settings['style_formats'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* This filter is documented in wp-includes/class-wp-editor.php */
+ $toolbar1 = apply_filters( 'mce_buttons', $toolbar1, 'classic-block' );
+
+ $toolbar2 = array(
+ 'strikethrough',
+ 'hr',
+ 'forecolor',
+ 'pastetext',
+ 'removeformat',
+ 'charmap',
+ 'outdent',
+ 'indent',
+ 'undo',
+ 'redo',
+ 'wp_help',
+ );
+
+ /* This filter is documented in wp-includes/class-wp-editor.php */
+ $toolbar2 = apply_filters( 'mce_buttons_2', $toolbar2, 'classic-block' );
+ /* This filter is documented in wp-includes/class-wp-editor.php */
+ $toolbar3 = apply_filters( 'mce_buttons_3', array(), 'classic-block' );
+ /* This filter is documented in wp-includes/class-wp-editor.php */
+ $toolbar4 = apply_filters( 'mce_buttons_4', array(), 'classic-block' );
+ /* This filter is documented in wp-includes/class-wp-editor.php */
+ $external_plugins = apply_filters( 'mce_external_plugins', array(), 'classic-block' );
+
+ $tinymce_settings = array(
+ 'plugins' => implode( ',', $tinymce_plugins ),
+ 'toolbar1' => implode( ',', $toolbar1 ),
+ 'toolbar2' => implode( ',', $toolbar2 ),
+ 'toolbar3' => implode( ',', $toolbar3 ),
+ 'toolbar4' => implode( ',', $toolbar4 ),
+ 'external_plugins' => wp_json_encode( $external_plugins ),
+ 'classic_block_editor' => true,
+ );
+
+ /* This filter is documented in wp-includes/class-wp-editor.php */
+ $tinymce_settings = apply_filters( 'tiny_mce_before_init', $tinymce_settings, 'classic-block' );
+
+ // Do "by hand" translation from PHP array to js object.
+ // Prevents breakage in some custom settings.
+ $init_obj = '';
+ foreach ( $tinymce_settings as $key => $value ) {
+ if ( is_bool( $value ) ) {
+ $val = $value ? 'true' : 'false';
+ $init_obj .= $key . ':' . $val . ',';
+ continue;
+ } elseif ( ! empty( $value ) && is_string( $value ) && (
+ ( '{' == $value{0} && '}' == $value{strlen( $value ) - 1} ) ||
+ ( '[' == $value{0} && ']' == $value{strlen( $value ) - 1} ) ||
+ preg_match( '/^\(?function ?\(/', $value ) ) ) {
+ $init_obj .= $key . ':' . $value . ',';
+ continue;
+ }
+ $init_obj .= $key . ':"' . $value . '",';
</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">- $scripts->localize(
- 'wp-block-library',
- 'wpEditorL10n',
- array(
- 'tinymce' => array(
- 'baseURL' => includes_url( 'js/tinymce' ),
- 'suffix' => SCRIPT_DEBUG ? '' : '.min',
- 'settings' => $tinymce_settings,
- ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $init_obj = '{' . trim( $init_obj, ' ,' ) . '}';
+
+ $script = 'window.wpEditorL10n = {
+ tinymce: {
+ baseURL: ' . wp_json_encode( includes_url( 'js/tinymce' ) ) . ',
+ suffix: ' . ( SCRIPT_DEBUG ? '""' : '".min"' ) . ',
+ settings: ' . $init_obj . ',
+ }
+ }';
+
+ $scripts->add_inline_script( 'wp-block-library', $script, 'before' );
</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></pre>
</div>
</div>
</body>
</html>