Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Load frontend scripts only when required (https://github.com/woocommerce/woocommerce-blocks/pull/746) 

* Load frontend scripts only when required

* Typo

* Use register_script from Assets
This commit is contained in:
Albert Juhé Lluveras 2019-07-22 11:36:51 +02:00
parent dff73240bc
commit ecc306b3cf
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/woocommerce-blocks/src/Assets.php
View File

@ -36,7 +36,6 @@ class Assets {
self::register_script( 'wc-blocks', plugins_url( 'build/blocks.js', __DIR__ ), array(), false );
self::register_script( 'wc-vendors', plugins_url( 'build/vendors.js', __DIR__ ), array(), false );
self::register_script( 'wc-packages', plugins_url( 'build/packages.js', __DIR__ ), array(), false );
self::register_script( 'wc-frontend', plugins_url( 'build/frontend.js', __DIR__ ), array( 'wc-vendors' ) );
// Individual blocks.
self::register_script( 'wc-handpicked-products', plugins_url( 'build/handpicked-products.js', __DIR__ ), array( 'wc-vendors', 'wc-packages', 'wc-blocks' ) );
@ -174,20 +173,37 @@ class Assets {
* @param string $src Full URL of the script, or path of the script relative to the WordPress root directory.
* @param array $deps Optional. An array of registered script handles this script depends on. Default empty array.
* @param bool $has_i18n Optional. Whether to add a script translation call to this file. Default 'true'.
* @param bool $enqueue Optional. Whether the script should be enqueued instead of registered.
*/
protected static function register_script( $handle, $src, $deps = array(), $has_i18n = true ) {
protected static function register_script( $handle, $src, $deps = array(), $has_i18n = true, $enqueue = false ) {
$filename = str_replace( plugins_url( '/', __DIR__ ), '', $src );
$ver = self::get_file_version( $filename );
$deps_path = dirname( __DIR__ ) . '/' . str_replace( '.js', '.deps.json', $filename );
$dependencies = file_exists( $deps_path ) ? json_decode( file_get_contents( $deps_path ) ) : array(); // phpcs:ignore WordPress.WP.AlternativeFunctions
$dependencies = array_merge( $dependencies, $deps );
wp_register_script( $handle, $src, $dependencies, $ver, true );
if ( $enqueue ) {
wp_enqueue_script( $handle, $src, $dependencies, $ver, true );
} else {
wp_register_script( $handle, $src, $dependencies, $ver, true );
}
if ( $has_i18n && function_exists( 'wp_set_script_translations' ) ) {
wp_set_script_translations( $handle, 'woo-gutenberg-products-block', dirname( __DIR__ ) . '/languages' );
}
}
/**
* Queues a script when required.
*
* @since 2.3.0
*
* @param string $name Name of the script used to identify the file inside build folder.
*/
public static function load_script_as_required( $name ) {
$filename = 'build/' . $name . '.js';
self::register_script( 'wc-' . $name, plugins_url( $filename, __DIR__ ), array( 'wc-vendors' ), true, true );
}
/**
* Registers a style according to `wp_register_style`.
*

1
plugins/woocommerce-blocks/src/BlockTypes/AbstractBlock.php
View File

@ -38,7 +38,6 @@ abstract class AbstractBlock {
'editor_script' => 'wc-' . $this->block_name,
'editor_style' => 'wc-block-editor',
'style' => 'wc-block-style',
'script' => 'wc-frontend',
)
);
}

29
plugins/woocommerce-blocks/src/BlockTypes/ProductCategories.php
View File

@ -20,4 +20,33 @@ class ProductCategories extends AbstractBlock {
* @var string
*/
protected $block_name = 'product-categories';
/**
* Registers the block type with WordPress.
*/
public function register_block_type() {
register_block_type(
$this->namespace . '/' . $this->block_name,
array(
'render_callback' => array( $this, 'render' ),
'editor_script' => 'wc-' . $this->block_name,
'editor_style' => 'wc-block-editor',
'style' => 'wc-block-style',
'script' => 'wc-frontend',
)
);
}
/**
* Append frontend scripts when rendering the Product Categories List block.
*
* @param array $attributes Block attributes. Default empty array.
* @param string $content Block content. Default empty string.
* @return string Rendered block type output.
*/
public function render( $attributes = array(), $content = '' ) {
\Automattic\WooCommerce\Blocks\Assets::load_script_as_required( 'frontend' );
return $content;
}
}