Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert PR 49646: "[Font API] Use registered fonts for Block Editor iframe." #49863

Merged
merged 1 commit into from
Apr 17, 2023
Merged

Revert PR 49646: "[Font API] Use registered fonts for Block Editor iframe." #49863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions lib/compat/wordpress-6.2/script-loader.php
View file
Open in desktop
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