<!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>[53160] trunk/src/wp-includes: Editor: Use block settings to pass assets for the iframed editor</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/53160">53160</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/53160","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-04-12 15:59:47 +0000 (Tue, 12 Apr 2022)</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'>Editor: Use block settings to pass assets for the iframed editor
Backports changes applied in Gutenberg in https://github.com/WordPress/gutenberg/pull/37193.
Props zieladam.
See <a href="https://core.trac.wordpress.org/ticket/55505">#55505</a>.
Follow-up for <a href="https://core.trac.wordpress.org/changeset/53157">[53157]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblockeditorphp"></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/block-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-editor.php 2022-04-12 15:59:45 UTC (rev 53159)
+++ trunk/src/wp-includes/block-editor.php 2022-04-12 15:59:47 UTC (rev 53160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,6 +288,77 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Collect the block editor assets that need to be loaded into the editor's iframe.
+ *
+ * @since 6.0.0
+ * @access private
+ *
+ * @global string $pagenow The filename of the current screen.
+ *
+ * @return array The block editor assets: styles and scripts.
+ */
+function _wp_get_iframed_editor_assets() {
+ global $pagenow;
+
+ $script_handles = array();
+ $style_handles = array(
+ 'wp-block-editor',
+ 'wp-block-library',
+ 'wp-block-library-theme',
+ 'wp-edit-blocks',
+ );
+
+ if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) {
+ $style_handles[] = 'wp-widgets';
+ $style_handles[] = 'wp-edit-widgets';
+ }
+
+ $block_registry = WP_Block_Type_Registry::get_instance();
+
+ foreach ( $block_registry->get_all_registered() as $block_type ) {
+ if ( ! empty( $block_type->style ) ) {
+ $style_handles[] = $block_type->style;
+ }
+
+ if ( ! empty( $block_type->editor_style ) ) {
+ $style_handles[] = $block_type->editor_style;
+ }
+
+ if ( ! empty( $block_type->script ) ) {
+ $script_handles[] = $block_type->script;
+ }
+ }
+
+ $style_handles = array_unique( $style_handles );
+ $done = wp_styles()->done;
+
+ ob_start();
+
+ // We do not need reset styles for the iframed editor.
+ wp_styles()->done = array( 'wp-reset-editor-styles' );
+ wp_styles()->do_items( $style_handles );
+ wp_styles()->done = $done;
+
+ $styles = ob_get_clean();
+
+ $script_handles = array_unique( $script_handles );
+ $done = wp_scripts()->done;
+
+ ob_start();
+
+ wp_scripts()->done = array();
+ wp_scripts()->do_items( $script_handles );
+ wp_scripts()->done = $done;
+
+ $scripts = ob_get_clean();
+
+ return array(
+ 'styles' => $styles,
+ 'scripts' => $scripts,
+ );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Returns the contextualized block editor settings for a selected editor context.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,8 +465,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $editor_settings['__experimentalFeatures']['spacing']['padding'] );
</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">- $editor_settings['localAutosaveInterval'] = 15;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_settings['__unstableResolvedAssets'] = _wp_get_iframed_editor_assets();
+ $editor_settings['localAutosaveInterval'] = 15;
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_settings['__experimentalDiscussionSettings'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'commentOrder' => get_option( 'comment_order' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'commentsPerPage' => get_option( 'comments_per_page' ),
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2022-04-12 15:59:45 UTC (rev 53159)
+++ trunk/src/wp-includes/default-filters.php 2022-04-12 15:59:47 UTC (rev 53160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,11 +591,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_maybe_inline_styles', 1 ); // Run for styles enqueued in <head>.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_footer', 'wp_maybe_inline_styles', 1 ); // Run for late-loaded styles in the footer.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'admin_footer-post.php', 'wp_add_iframed_editor_assets_html' );
-add_action( 'admin_footer-post-new.php', 'wp_add_iframed_editor_assets_html' );
-add_action( 'admin_footer-widgets.php', 'wp_add_iframed_editor_assets_html' );
-add_action( 'admin_footer-site-editor.php', 'wp_add_iframed_editor_assets_html' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'edit_form_after_title', '_disable_content_editor_for_navigation_post_type' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'edit_form_after_editor', '_enable_content_editor_for_navigation_post_type' );
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2022-04-12 15:59:45 UTC (rev 53159)
+++ trunk/src/wp-includes/deprecated.php 2022-04-12 15:59:47 UTC (rev 53160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4301,3 +4301,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array_key_exists( '__experimentalSkipSerialization', $spacing_support ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> $spacing_support['__experimentalSkipSerialization'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Inject the block editor assets that need to be loaded into the editor's iframe as an inline script.
+ *
+ * @since 5.8.0
+ * @deprecated 6.0.0
+ */
+function wp_add_iframed_editor_assets_html() {
+ _deprecated_function( __FUNCTION__, '6.0.0' );
+}
</ins></span></pre></div>
<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 2022-04-12 15:59:45 UTC (rev 53159)
+++ trunk/src/wp-includes/script-loader.php 2022-04-12 15:59:47 UTC (rev 53160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2884,82 +2884,6 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Inject the block editor assets that need to be loaded into the editor's iframe as an inline script.
- *
- * @since 5.8.0
- *
- * @global string $pagenow The filename of the current screen.
- */
-function wp_add_iframed_editor_assets_html() {
- global $pagenow;
-
- if ( ! wp_should_load_block_editor_scripts_and_styles() ) {
- return;
- }
-
- $script_handles = array();
- $style_handles = array(
- 'wp-block-editor',
- 'wp-block-library',
- 'wp-block-library-theme',
- 'wp-edit-blocks',
- );
-
- if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) {
- $style_handles[] = 'wp-widgets';
- $style_handles[] = 'wp-edit-widgets';
- }
-
- $block_registry = WP_Block_Type_Registry::get_instance();
-
- foreach ( $block_registry->get_all_registered() as $block_type ) {
- if ( ! empty( $block_type->style ) ) {
- $style_handles[] = $block_type->style;
- }
-
- if ( ! empty( $block_type->editor_style ) ) {
- $style_handles[] = $block_type->editor_style;
- }
-
- if ( ! empty( $block_type->script ) ) {
- $script_handles[] = $block_type->script;
- }
- }
-
- $style_handles = array_unique( $style_handles );
- $done = wp_styles()->done;
-
- ob_start();
-
- // We do not need reset styles for the iframed editor.
- wp_styles()->done = array( 'wp-reset-editor-styles' );
- wp_styles()->do_items( $style_handles );
- wp_styles()->done = $done;
-
- $styles = ob_get_clean();
-
- $script_handles = array_unique( $script_handles );
- $done = wp_scripts()->done;
-
- ob_start();
-
- wp_scripts()->done = array();
- wp_scripts()->do_items( $script_handles );
- wp_scripts()->done = $done;
-
- $scripts = ob_get_clean();
-
- $editor_assets = wp_json_encode(
- array(
- 'styles' => $styles,
- 'scripts' => $scripts,
- )
- );
-
- echo "<script>window.__editorAssets = $editor_assets</script>";
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Function that enqueues the CSS Custom Properties coming from theme.json.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span></span></pre>
</div>
</div>
</body>
</html>