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

Link to widgets.php instead of themes.php?page=gutenberg-widgets #32299

Merged
merged 4 commits into from
May 31, 2021
Merged

Link to widgets.php instead of themes.php?page=gutenberg-widgets #32299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c16ad4e
Link to widgets.php instead of themes.php?page=gutenberg-widgets
noisysocks May 28, 2021
4c57f3a
Use location.pathname for Customizer return URL
noisysocks May 31, 2021
6d1ada7
Add back missing add_theme_support()
noisysocks May 31, 2021
99d8764
Use widgets.php in Legacy Widget preview iframe
noisysocks May 31, 2021
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
16 changes: 13 additions & 3 deletions lib/init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ function gutenberg_menu() {
'gutenberg'
);

if ( gutenberg_use_widgets_block_editor() ) {
if (
gutenberg_use_widgets_block_editor() &&
! function_exists( 'wp_use_widgets_block_editor' )
) {
add_theme_page(
__( 'Widgets', 'gutenberg' ),
__( 'Widgets', 'gutenberg' ),
Expand Down Expand Up @@ -113,7 +116,11 @@ function gutenberg_site_editor_menu() {
* @param WP_Admin_Bar $wp_admin_bar Core class used to implement the Toolbar API.
*/
function modify_admin_bar( $wp_admin_bar ) {
if ( gutenberg_use_widgets_block_editor() && $wp_admin_bar->get_node( 'widgets' ) !== null ) {
if (
gutenberg_use_widgets_block_editor() &&
! function_exists( 'wp_use_widgets_block_editor' ) &&
$wp_admin_bar->get_node( 'widgets' ) !== null
) {
$wp_admin_bar->add_menu(
array(
'id' => 'widgets',
Expand All @@ -137,7 +144,10 @@ function modify_welcome_panel() {
ob_start();
wp_welcome_panel();
$welcome_panel = ob_get_clean();
if ( gutenberg_use_widgets_block_editor() ) {
if (
gutenberg_use_widgets_block_editor() &&
! function_exists( 'wp_use_widgets_block_editor' )
) {
echo str_replace(
admin_url( 'widgets.php' ),
admin_url( 'themes.php?page=gutenberg-widgets' ),
Expand Down
3 changes: 1 addition & 2 deletions packages/block-library/src/legacy-widget/edit/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ export default function Preview( { idBase, instance, isVisible } ) {
// TODO: This chokes when the query param is too big.
// Ideally, we'd render a <ServerSideRender>. Maybe by
// rendering one in an iframe via a portal.
src={ addQueryArgs( 'themes.php', {
page: 'gutenberg-widgets',
src={ addQueryArgs( 'widgets.php', {
Copy link
Member

Choose a reason for hiding this comment

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

Should we also handle different URLs here?

Copy link
Member Author

@noisysocks noisysocks May 31, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think it's necessary. The iframe intercept code will fire regardless of what WP Admin page is loaded because it's hooked into the init action.

'legacy-widget-preview': {
idBase,
instance,
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-widgets/src/components/sidebar/widget-areas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default function WidgetAreas( { selectedWidgetAreaId } ) {
<Button
href={ addQueryArgs( 'customize.php', {
'autofocus[panel]': 'widgets',
return: 'themes.php?page=gutenberg-widgets',
return: window.location.pathname,
} ) }
variant="tertiary"
>
Expand Down