mirror of
https://github.com/woocommerce/woocommerce-paypal-payments.git
synced 2025-09-01 07:02:48 +08:00
Refactor styles loading on GooglePay and ApplePay
Remove unnecessary console.log on GooglePay and ApplePay
This commit is contained in:
parent
567a7a2065
commit
b11a539c24
6 changed files with 56 additions and 21 deletions
|
@ -189,7 +189,6 @@ class GooglepayButton {
|
|||
callback(el);
|
||||
} else if (timeElapsed > timeout) {
|
||||
clearInterval(interval);
|
||||
console.error('Waiting for wrapper timed out.', selector);
|
||||
}
|
||||
}, delay);
|
||||
}
|
||||
|
|
|
@ -363,6 +363,23 @@ class Button implements ButtonInterface {
|
|||
);
|
||||
wp_enqueue_script( 'wc-ppcp-googlepay' );
|
||||
|
||||
$this->enqueue_styles();
|
||||
|
||||
wp_localize_script(
|
||||
'wc-ppcp-googlepay',
|
||||
'wc_ppcp_googlepay',
|
||||
$this->script_data()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Enqueues styles.
|
||||
*/
|
||||
public function enqueue_styles(): void {
|
||||
if ( ! $this->is_enabled() ) {
|
||||
return;
|
||||
}
|
||||
|
||||
wp_register_style(
|
||||
'wc-ppcp-googlepay',
|
||||
untrailingslashit( $this->module_url ) . '/assets/css/styles.css',
|
||||
|
@ -370,12 +387,6 @@ class Button implements ButtonInterface {
|
|||
$this->version
|
||||
);
|
||||
wp_enqueue_style( 'wc-ppcp-googlepay' );
|
||||
|
||||
wp_localize_script(
|
||||
'wc-ppcp-googlepay',
|
||||
'wc_ppcp_googlepay',
|
||||
$this->script_data()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -89,11 +89,18 @@ class GooglepayModule implements ModuleInterface {
|
|||
static function () use ( $c, $button ) {
|
||||
$smart_button = $c->get( 'button.smart-button' );
|
||||
assert( $smart_button instanceof SmartButtonInterface );
|
||||
$page_has_block = has_block( 'woocommerce/checkout' ) || has_block( 'woocommerce/cart' );
|
||||
if ( ! $smart_button->should_load_ppcp_script() && ! $page_has_block ) {
|
||||
return;
|
||||
if ( $smart_button->should_load_ppcp_script() ) {
|
||||
$button->enqueue();
|
||||
}
|
||||
|
||||
if ( has_block( 'woocommerce/checkout' ) || has_block( 'woocommerce/cart' ) ) {
|
||||
/**
|
||||
* Should add this to the ButtonInterface.
|
||||
*
|
||||
* @psalm-suppress UndefinedInterfaceMethod
|
||||
*/
|
||||
$button->enqueue_styles();
|
||||
}
|
||||
$button->enqueue();
|
||||
}
|
||||
);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue