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

Jump to bottom

Issue #4678 - Improve tests for 'classic-editor' #4693

Closed
wants to merge 11 commits into from
Closed

Issue #4678 - Improve tests for 'classic-editor' #4693

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
034d0b3
Fixes #4541 (#1)
bobbingwide Jan 17, 2018
a1c401b
Update ISSUE_TEMPLATE.md
bobbingwide Jan 22, 2018
ef04cd5
Issue 4678 - change test for presence of 'classic-editor' which may b…
bobbingwide Jan 26, 2018
cc0a495
Issue #4678 - test for classic-editor when enqueueing scripts and styles
bobbingwide Jan 26, 2018
3bff4f1
Added space to keep PHPCS happy
bobbingwide Feb 8, 2018
c2a0ddf
Issue #4678 - revert change to gutenberg.php
bobbingwide Feb 8, 2018
3cef75d
Merge remote-tracking branch 'origin/master' into fix/4678
bobbingwide Feb 8, 2018
7dc587c
Issue #4678 - change wasn't needed
bobbingwide Feb 8, 2018
e3ef410
Issue #4678 - use isset rather than array_key_exists
bobbingwide Feb 8, 2018
f607ad2
Merge remote-tracking branch 'gutenberg/master' into fix/4678
bobbingwide Feb 17, 2018
ed5c34e
Issue #4678 - no need to call gutenberg_common_scripts_and_styles for…
bobbingwide Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/client-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,10 @@ function gutenberg_prepare_blocks_for_js() {
* @since 0.4.0
*/
function gutenberg_common_scripts_and_styles() {
// Avoid enqueuing block scripts into classic editor.
if ( isset( $_GET['classic-editor'] ) ) {
return;
}
// Enqueue basic styles built out of Gutenberg through `npm build`.
wp_enqueue_style( 'wp-blocks' );

Expand All @@ -712,7 +716,6 @@ function gutenberg_common_scripts_and_styles() {
do_action( 'enqueue_block_assets' );
}
add_action( 'wp_enqueue_scripts', 'gutenberg_common_scripts_and_styles' );
add_action( 'admin_enqueue_scripts', 'gutenberg_common_scripts_and_styles' );

/**
* Enqueues registered block scripts and styles, depending on current rendered
Expand Down