Skip to content

Merge conflicting wp.editor objects into a single, non-conflicting module #33228

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

Merged
youknowriad merged 13 commits into from
Jul 9, 2021
Merged

Merge conflicting wp.editor objects into a single, non-conflicting module #33228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
01daa00
Export members of legacy window.wp.editor from the new window.wp.edit…
adamziel Jul 6, 2021
b644a7d
Add an explanatory comment
adamziel Jul 6, 2021
d880b51
Use optional chaining for editor/index.js exports
adamziel Jul 6, 2021
8d4a984
Default to an empty object on export from oldEditor
adamziel Jul 6, 2021
ae66155
Use an inline script instead of modifying the @wordpress/editor package
adamziel Jul 7, 2021
ed8f3a8
Lint
adamziel Jul 7, 2021
f4601f7
Move the inline script to gutenberg_override_script
adamziel Jul 8, 2021
723a9c8
Remove gutenberg_enqueue_wp_old_editor_compatibility_snippet
adamziel Jul 8, 2021
59db57c
Formatting
adamziel Jul 8, 2021
ae4b7ac
Adjust wp-editor-meta-box E2E test
adamziel Jul 8, 2021
48c1929
Only add inline script if the handle is wp-editor
adamziel Jul 8, 2021
7277ce9
Add explanatory comment for the e2e test
adamziel Jul 9, 2021
c714c89
Add even more context to that comment
adamziel Jul 9, 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
Prev Previous commit
Next Next commit
Move the inline script to gutenberg_override_script
  • Loading branch information
@adamziel
adamziel committed Jul 8, 2021
commit f4601f76cf5f8657840d2aee6b5a363067fbb5d6
12 changes: 12 additions & 0 deletions lib/client-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ function gutenberg_override_script( $scripts, $handle, $src, $deps = array(), $v
$output = sprintf( "wp.i18n.setLocaleData( { 'text direction\u0004ltr': [ '%s' ] }, 'default' );", $ltr );
$scripts->add_inline_script( 'wp-i18n', $output, 'after' );
}

/*
* Wp-editor module is exposed as window.wp.editor.
* Problem: there is quite some code expecting window.wp.oldEditor object available under window.wp.editor.
* Solution: fuse the two objects together to maintain backward compatibility.
* For more context, see https://github.com/WordPress/gutenberg/issues/33203
*/
wp_add_inline_script(
'wp-editor',
'Object.assign(window.wp.editor, window.wp.oldEditor);',
'after'
);
}

/**
Expand Down
16 changes: 0 additions & 16 deletions lib/widgets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,6 @@ function gutenberg_use_widgets_block_editor() {
);
}

/**
* Wp-editor module is exposed as window.wp.editor.
* Problem: there is quite some code expecting window.wp.oldEditor object available under window.wp.editor.
* Solution: fuse the two objects together to maintain backward compatibility.
* For more context, see https://github.com/WordPress/gutenberg/issues/33203
*
* @return void
*/
function gutenberg_enqueue_wp_old_editor_compatibility_snippet() {
wp_add_inline_script(
'wp-editor',
'Object.assign(window.wp.editor, window.wp.oldEditor);',
'after'
);
}

/**
* Returns the settings required by legacy widgets blocks.
*
Expand Down