| @@ -8,18 +8,22 @@ | ||
| 8 | 8 | /** |
| 9 | 9 | * Sets a global JS variable used to trigger the availability of each Gutenberg Experiment. |
| 10 | 10 | */ |
| 11 | 11 | function gutenberg_enable_experiments() { |
| 12 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-color-randomizer' ) ) { | |
| 12 | + $gutenberg_experiments = get_option( 'gutenberg-experiments' ); | |
| 13 | + if ( $gutenberg_experiments && array_key_exists( 'gutenberg-color-randomizer', $gutenberg_experiments ) ) { | |
| 13 | 14 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableColorRandomizer = true', 'before' ); |
| 14 | 15 | } |
| 15 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-grid-interactivity' ) ) { | |
| 16 | + if ( $gutenberg_experiments && array_key_exists( 'gutenberg-grid-interactivity', $gutenberg_experiments ) ) { | |
| 16 | 17 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGridInteractivity = true', 'before' ); |
| 17 | 18 | } |
| 18 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-dataviews-media-modal' ) ) { | |
| 19 | + if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) { | |
| 20 | + wp_add_inline_script( 'wp-block-library', 'window.__experimentalDisableTinymce = true', 'before' ); | |
| 21 | + } | |
| 22 | + if ( $gutenberg_experiments && array_key_exists( 'gutenberg-dataviews-media-modal', $gutenberg_experiments ) ) { | |
| 19 | 23 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalDataViewsMediaModal = true', 'before' ); |
| 20 | 24 | } |
| 21 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-content-only-inspector-fields' ) ) { | |
| 25 | + if ( $gutenberg_experiments && array_key_exists( 'gutenberg-content-only-inspector-fields', $gutenberg_experiments ) ) { | |
| 22 | 26 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalContentOnlyInspectorFields = true', 'before' ); |
| 23 | 27 | } |
| 24 | 28 | if ( gutenberg_is_experiment_enabled( 'active_templates' ) ) { |
| 25 | 29 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalTemplateActivate = true', 'before' ); |
| @@ -26,17 +30,11 @@ | ||
| 26 | 30 | } |
| 27 | 31 | if ( gutenberg_is_experiment_enabled( 'gutenberg-extensible-site-editor' ) ) { |
| 28 | 32 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalExtensibleSiteEditor = true', 'before' ); |
| 29 | 33 | } |
| 30 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-dataform-inspector' ) ) { | |
| 31 | - wp_add_inline_script( 'wp-editor', 'window.__experimentalDataFormInspector = true', 'before' ); | |
| 32 | - } | |
| 33 | 34 | if ( gutenberg_is_experiment_enabled( 'gutenberg-media-editor' ) ) { |
| 34 | 35 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalMediaEditor = true', 'before' ); |
| 35 | 36 | } |
| 36 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-dashboard-widgets' ) ) { | |
| 37 | - wp_add_inline_script( 'wp-block-editor', 'window.__experimentalDashboardWidgets = true', 'before' ); | |
| 38 | - } | |
| 39 | 37 | } |
| 40 | 38 | |
| 41 | 39 | add_action( 'admin_init', 'gutenberg_enable_experiments' ); |
| 42 | 40 | add_action( 'site-editor-v2_init', 'gutenberg_enable_experiments' ); |
| @@ -53,15 +51,17 @@ | ||
| 53 | 51 | /** |
| 54 | 52 | * Sets global JS variables used to enable various block experiments. |
| 55 | 53 | */ |
| 56 | 54 | function gutenberg_enable_block_experiments() { |
| 55 | + $gutenberg_experiments = get_option( 'gutenberg-experiments' ); | |
| 56 | + | |
| 57 | 57 | // Experimental form blocks. |
| 58 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) { | |
| 58 | + if ( $gutenberg_experiments && array_key_exists( 'gutenberg-form-blocks', $gutenberg_experiments ) ) { | |
| 59 | 59 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableFormBlocks = true', 'before' ); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | // General experimental blocks that are not in the default block library. |
| 63 | - if ( gutenberg_is_experiment_enabled( 'gutenberg-block-experiments' ) ) { | |
| 63 | + if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-experiments', $gutenberg_experiments ) ) { | |
| 64 | 64 | wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableBlockExperiments = true', 'before' ); |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |