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

Only load front end CSS when it is needed #1455

Merged
merged 8 commits into from
Apr 30, 2020
Merged

Only load front end CSS when it is needed #1455

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cc9eb0
Only load front end CSS when it is needed
josephscott Apr 15, 2020
5449da2
Define $post global and don't overwrite it
jrtashjian Apr 30, 2020
0d126dc
Ensure assets load when block editor is used.
jrtashjian Apr 30, 2020
fa32f4f
Only check post content if not in the admin
jrtashjian Apr 30, 2020
544d11f
Resolve failing tests
jrtashjian Apr 30, 2020
f44c511
Adding tests
jrtashjian Apr 30, 2020
3d6375c
Updating contributors
jrtashjian Apr 30, 2020
4251b6d
Merge branch 'master' into pr/josephscott/1455
jrtashjian Apr 30, 2020
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
Only check post content if not in the admin
  • Loading branch information
@jrtashjian
jrtashjian committed Apr 30, 2020
commit fa32f4f72c7ab6637fa647af1babda132927765a
42 changes: 24 additions & 18 deletions includes/class-coblocks-block-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,17 @@ public function block_assets() {
// Only load the front end CSS if a Coblock is in use.
$has_coblock = false;

// This is similar to has_block() in core, but will match anything
// in the coblocks/* namespace.
$wp_post = get_post( $post );
if ( $wp_post instanceof WP_Post ) {
$post_content = $wp_post->post_content;
}
if ( ! is_admin() ) {
// This is similar to has_block() in core, but will match anything
// in the coblocks/* namespace.
$wp_post = get_post( $post );
if ( $wp_post instanceof WP_Post ) {
$post_content = $wp_post->post_content;
}

if ( false !== strpos( $post_content, '<!-- wp:coblocks/' ) ) {
$has_coblock = true;
if ( false !== strpos( $post_content, '<!-- wp:coblocks/' ) ) {
$has_coblock = true;
}
}

if ( ! $has_coblock && ! $this->is_page_gutenberg() ) {
Expand Down Expand Up @@ -393,27 +395,31 @@ protected function is_post_type_gutenberg( $post_type ) {
* Return whether the page we are on is loading the Block Editor.
*/
protected function is_page_gutenberg() {
$page = wp_basename( esc_url( $_SERVER['REQUEST_URI'] ) );
if ( ! is_admin() ) {
return false;
}

$admin_page = wp_basename( esc_url( $_SERVER['REQUEST_URI'] ) );

if ( false !== strpos( $page, 'post-new.php' ) && empty( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
if ( false !== strpos( $admin_page, 'post-new.php' ) && empty( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
return true;
}

if ( false !== strpos( $page, 'post-new.php' ) && isset( $_GET['post_type'] ) && $this->is_post_type_gutenberg( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
if ( false !== strpos( $admin_page, 'post-new.php' ) && isset( $_GET['post_type'] ) && $this->is_post_type_gutenberg( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
return true;
}

if ( false !== strpos( $page, 'post.php' ) ) {
$post = get_post( $_GET['post'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
if ( isset( $post ) && isset( $post->post_type ) && $this->is_post_type_gutenberg( $post->post_type ) ) {
if ( false !== strpos( $admin_page, 'post.php' ) ) {
$wp_post = get_post( $_GET['post'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
if ( isset( $wp_post ) && isset( $wp_post->post_type ) && $this->is_post_type_gutenberg( $wp_post->post_type ) ) {
return true;
}
}

if ( false !== strpos( $page, 'revision.php' ) ) {
$post = get_post( $_GET['revision'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
$parent = get_post( $post->post_parent );
if ( isset( $parent ) && isset( $parent->post_type ) && $this->is_post_type_gutenberg( $parent->post_type ) ) {
if ( false !== strpos( $admin_page, 'revision.php' ) ) {
$wp_post = get_post( $_GET['revision'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
$post_parent = get_post( $wp_post->post_parent );
if ( isset( $post_parent ) && isset( $post_parent->post_type ) && $this->is_post_type_gutenberg( $post_parent->post_type ) ) {
return true;
}
}
Expand Down