Skip to content

Commit

Permalink
Revert "[Font API] Use registered fonts for Block Editor iframe. (#49646
Browse files Browse the repository at this point in the history
)" (#49863)

This reverts commit d39f350.
  • Loading branch information
Tonya Mork authored and bph committed Apr 17, 2023
1 parent 2bb3cf1 commit 87818e1
Showing 1 changed file with 12 additions and 19 deletions.
31 changes: 12 additions & 19 deletions lib/compat/wordpress-6.2/script-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,33 +130,26 @@ function gutenberg_resolve_assets_override() {
$scripts = ob_get_clean();

/*
* Generate font @font-face styles for the iframe.
*
* For the Site Editor, use the registered fonts.
* For the Block Editor, use the enqueued fonts.
* Generate font @font-face styles for the site editor iframe.
* Use the registered font families for printing.
*/
if ( class_exists( 'WP_Fonts' ) ) {
$wp_fonts = wp_fonts();
$registered = $wp_fonts->get_registered_font_families();
$is_site_editor = 'site-editor.php' === $pagenow;

$wp_fonts = wp_fonts();
$registered = $wp_fonts->get_registered_font_families();
if ( ! empty( $registered ) ) {
$done = $wp_fonts->done;
$wp_fonts->done = array();
if ( $is_site_editor ) {
$queue = $wp_fonts->queue;
$wp_fonts->queue = $registered;
}
$queue = $wp_fonts->queue;
$done = $wp_fonts->done;

$wp_fonts->done = array();
$wp_fonts->queue = $registered;

ob_start();
$wp_fonts->do_items();
$styles .= ob_get_clean();

// Reset the Fonts API.
$wp_fonts->done = $done;
if ( $is_site_editor ) {
$wp_fonts->queue = $queue;
}
// Reset the Web Fonts API.
$wp_fonts->done = $done;
$wp_fonts->queue = $queue;
}
}

Expand Down

0 comments on commit 87818e1

Please sign in to comment.