Skip to content

Backport defaultDuotone option #12

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

Closed
ajlende wants to merge 6 commits into from
Closed

Backport defaultDuotone option #12

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40418ea
Squashed commits from WordPress/gutenberg#38681
Feb 16, 2022
f2f1a7d
Move where duotone rendering happens
Feb 16, 2022
41080f4
Only render SVGs on edit-post in admin
Feb 17, 2022
18bcda6
Check block editor differently
Feb 17, 2022
e6ae1e1
Fix comment for wp_global_styles_render_svg_filters
Feb 17, 2022
203c064
Fix doc comment for get_metadata_boolean
Feb 17, 2022
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
Prev Previous commit
Next Next commit
Only render SVGs on edit-post in admin
  • Loading branch information
Alex Lende committed Feb 17, 2022
commit 41080f467acd343005917d14711031ff0c96fc3c
12 changes: 12 additions & 0 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2347,6 +2347,18 @@ function wp_enqueue_global_styles() {
* @since 5.9.0
*/
function wp_global_styles_render_svg_filters() {
/*
* When calling via the in_admin_header action, we only want to render the
* SVGs on the post editor page.
*/
global $pagenow;
if (
is_admin() &&
( 'post.php' !== $pagenow || 'edit' !== $_GET['action'] )
Copy link
Owner

@Mamaduka Mamaduka Feb 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also use is_admin() && get_current_screen()->is_block_editor() it should work for the site editor as well.

Copy link
Author

@ajlende ajlende Feb 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The site editor doesn't need the SVGs because it's rendering the editor in an iframe that doesn't have access to the filters rendered in the page.

WordPress/gutenberg#37727 is open to render the SVGs via JavaScript into that iframe.

Copy link
Author

@ajlende ajlende Feb 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even so, I think get_current_screen()->is_block_editor() is still a better way of checking, so I've updated it.

There are a bunch of other checks that are happening with that method, so it's probably safer to use.

) {
return;
}

$filters = wp_get_global_styles_svg_filters();
if ( ! empty( $filters ) ) {
echo $filters;
Expand Down