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

Only disable wpautop on the main TinyMCE instance for the page #8229

Merged
merged 6 commits into from
Jul 30, 2018
Merged

Only disable wpautop on the main TinyMCE instance for the page #8229

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f347edc
Only disable `wpautop` on the main TinyMCE instance for the page
danielbachhuber Jul 26, 2018
3bc07ab
Clarify this statement a wee bit
danielbachhuber Jul 26, 2018
5666d26
Add e2e test for TinyMCE wpautop behavior
danielbachhuber Jul 26, 2018
18900cc
Assert initial text; wait for browser to reload page
danielbachhuber Jul 26, 2018
e683544
Use a greater level of precision by targeting the unique `$editor_id`
danielbachhuber Jul 26, 2018
59cd86c
Remove e2e tests, which are behaving oddly and will break with modal UX
danielbachhuber Jul 26, 2018
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
11 changes: 6 additions & 5 deletions lib/compat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,19 @@ function _gutenberg_utf8_split( $str ) {
* Disables wpautop behavior in classic editor when post contains blocks, to
* prevent removep from invalidating paragraph blocks.
*
* @param array $settings Original editor settings.
* @return array Filtered settings.
* @param array $settings Original editor settings.
* @param string $editor_id ID for the editor instance.
* @return array Filtered settings.
*/
function gutenberg_disable_editor_settings_wpautop( $settings ) {
function gutenberg_disable_editor_settings_wpautop( $settings, $editor_id ) {
$post = get_post();
if ( is_object( $post ) && gutenberg_post_has_blocks( $post ) ) {
if ( 'content' === $editor_id && is_object( $post ) && gutenberg_post_has_blocks( $post ) ) {
$settings['wpautop'] = false;
}

return $settings;
}
add_filter( 'wp_editor_settings', 'gutenberg_disable_editor_settings_wpautop' );
add_filter( 'wp_editor_settings', 'gutenberg_disable_editor_settings_wpautop', 10, 2 );

/**
* Add TinyMCE fixes for the Classic Editor.
Expand Down