| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Bootstraping the Gutenberg experiments page. | |
| 3 | + * Bootstrapping the Gutenberg experiments page. | |
| 4 | 4 | * |
| 5 | 5 | * @package gutenberg |
| 6 | 6 | */ |
| 7 | 7 | |
| @@ -40,62 +40,18 @@ | ||
| 40 | 40 | 'gutenberg_display_experiment_section', |
| 41 | 41 | 'gutenberg-experiments' |
| 42 | 42 | ); |
| 43 | 43 | add_settings_field( |
| 44 | - 'gutenberg-widget-experiments', | |
| 45 | - __( 'Widgets', 'gutenberg' ), | |
| 44 | + 'gutenberg-navigation', | |
| 45 | + __( 'Navigation', 'gutenberg' ), | |
| 46 | 46 | 'gutenberg_display_experiment_field', |
| 47 | 47 | 'gutenberg-experiments', |
| 48 | 48 | 'gutenberg_experiments_section', |
| 49 | 49 | array( |
| 50 | - 'label' => __( 'Enable Widgets screen and Legacy Widgets block', 'gutenberg' ), | |
| 51 | - 'id' => 'gutenberg-widget-experiments', | |
| 50 | + 'label' => __( 'Enable Navigation screen', 'gutenberg' ), | |
| 51 | + 'id' => 'gutenberg-navigation', | |
| 52 | 52 | ) |
| 53 | 53 | ); |
| 54 | - add_settings_field( | |
| 55 | - 'gutenberg-block-directory', | |
| 56 | - __( 'Block Directory', 'gutenberg' ), | |
| 57 | - 'gutenberg_display_experiment_field', | |
| 58 | - 'gutenberg-experiments', | |
| 59 | - 'gutenberg_experiments_section', | |
| 60 | - array( | |
| 61 | - 'label' => __( 'Enable block directory search', 'gutenberg' ), | |
| 62 | - 'id' => 'gutenberg-block-directory', | |
| 63 | - ) | |
| 64 | - ); | |
| 65 | - add_settings_field( | |
| 66 | - 'gutenberg-full-site-editing', | |
| 67 | - __( 'Full Site Editing', 'gutenberg' ), | |
| 68 | - 'gutenberg_display_experiment_field', | |
| 69 | - 'gutenberg-experiments', | |
| 70 | - 'gutenberg_experiments_section', | |
| 71 | - array( | |
| 72 | - 'label' => __( 'Enable Full Site Editing (Warning: this will replace your theme and cause potentially irreversible changes to your site. We recommend using this only in a development environment.)', 'gutenberg' ), | |
| 73 | - 'id' => 'gutenberg-full-site-editing', | |
| 74 | - ) | |
| 75 | - ); | |
| 76 | - add_settings_field( | |
| 77 | - 'gutenberg-full-site-editing-demo', | |
| 78 | - __( 'Full Site Editing Demo Templates', 'gutenberg' ), | |
| 79 | - 'gutenberg_display_experiment_field', | |
| 80 | - 'gutenberg-experiments', | |
| 81 | - 'gutenberg_experiments_section', | |
| 82 | - array( | |
| 83 | - 'label' => __( 'Enable Full Site Editing demo templates', 'gutenberg' ), | |
| 84 | - 'id' => 'gutenberg-full-site-editing-demo', | |
| 85 | - ) | |
| 86 | - ); | |
| 87 | - add_settings_field( | |
| 88 | - 'gutenberg-page-templates', | |
| 89 | - __( 'Page Templates', 'gutenberg' ), | |
| 90 | - 'gutenberg_display_experiment_field', | |
| 91 | - 'gutenberg-experiments', | |
| 92 | - 'gutenberg_experiments_section', | |
| 93 | - array( | |
| 94 | - 'label' => __( 'Enable page templates', 'gutenberg' ), | |
| 95 | - 'id' => 'gutenberg-page-templates', | |
| 96 | - ) | |
| 97 | - ); | |
| 98 | 54 | register_setting( |
| 99 | 55 | 'gutenberg-experiments', |
| 100 | 56 | 'gutenberg-experiments' |
| 101 | 57 | ); |
| @@ -140,22 +96,18 @@ | ||
| 140 | 96 | * |
| 141 | 97 | * @return array Filtered editor settings. |
| 142 | 98 | */ |
| 143 | 99 | function gutenberg_experiments_editor_settings( $settings ) { |
| 100 | + // The refactored gallery currently can't be run on sites with use_balanceTags option set. | |
| 101 | + // This bypass needs to remain in place until this is resolved and a patch released. | |
| 102 | + // https://core.trac.wordpress.org/ticket/54130. | |
| 144 | 103 | $experiments_settings = array( |
| 145 | - '__experimentalEnableLegacyWidgetBlock' => gutenberg_is_experiment_enabled( 'gutenberg-widget-experiments' ), | |
| 146 | - '__experimentalBlockDirectory' => gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ), | |
| 147 | - '__experimentalEnableFullSiteEditing' => gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing' ), | |
| 148 | - '__experimentalEnableFullSiteEditingDemo' => gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing-demo' ), | |
| 149 | - '__experimentalEnablePageTemplates' => gutenberg_is_experiment_enabled( 'gutenberg-page-templates' ), | |
| 104 | + '__unstableGalleryWithImageBlocks' => (int) get_option( 'use_balanceTags' ) !== 1 || is_wp_version_compatible( '5.9' ), | |
| 150 | 105 | ); |
| 151 | - | |
| 152 | - $gradient_presets = current( (array) get_theme_support( '__experimental-editor-gradient-presets' ) ); | |
| 153 | - if ( false !== $gradient_presets ) { | |
| 154 | - $experiments_settings['gradients'] = $gradient_presets; | |
| 155 | - } | |
| 156 | - | |
| 157 | - $experiments_settings['disableCustomGradients'] = get_theme_support( '__experimental-disable-custom-gradients' ); | |
| 158 | - | |
| 159 | 106 | return array_merge( $settings, $experiments_settings ); |
| 160 | 107 | } |
| 161 | -add_filter( 'block_editor_settings', 'gutenberg_experiments_editor_settings' ); | |
| 108 | +// This can be removed when plugin support requires WordPress 5.8.0+. | |
| 109 | +if ( function_exists( 'get_block_editor_settings' ) ) { | |
| 110 | + add_filter( 'block_editor_settings_all', 'gutenberg_experiments_editor_settings' ); | |
| 111 | +} else { | |
| 112 | + add_filter( 'block_editor_settings', 'gutenberg_experiments_editor_settings' ); | |
| 113 | +} | |
