woocommerce/storefront
2
0
Fork 0
mirror of https://github.com/woocommerce/storefront.git synced 2025-08-21 04:11:59 +08:00
Code Issues Packages Wiki Activity Actions

Remove inline CSS cache

Browse source
This commit is contained in:
Tiago Noronha 2018-05-10 15:27:12 +01:00
parent acbd233c16
commit 33a003bcff
2 changed files with 15 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
inc/customizer/class-storefront-customizer.php
View file

@ -31,9 +31,6 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
add_action( 'customize_controls_print_styles', array( $this, 'customizer_custom_control_css' ) ); add_action( 'customize_controls_print_styles', array( $this, 'customizer_custom_control_css' ) );
add_action( 'customize_register', array( $this, 'edit_default_customizer_settings' ), 99 ); add_action( 'customize_register', array( $this, 'edit_default_customizer_settings' ), 99 );
add_action( 'init', array( $this, 'default_theme_mod_values' ), 10 ); add_action( 'init', array( $this, 'default_theme_mod_values' ), 10 );
add_action( 'after_switch_theme', array( $this, 'set_storefront_style_theme_mods' ) );
add_action( 'customize_save_after', array( $this, 'set_storefront_style_theme_mods' ) );
} }
/** /**
@ -919,31 +916,26 @@ if ( ! class_exists( 'Storefront_Customizer' ) ) :
/** /**
* Assign Storefront styles to individual theme mods. * Assign Storefront styles to individual theme mods.
* *
* @deprecated 2.3.1
* @return void * @return void
*/ */
public function set_storefront_style_theme_mods() { public function set_storefront_style_theme_mods() {
set_theme_mod( 'storefront_styles', $this->get_css() ); if ( function_exists( 'wc_deprecated_function' ) ) {
set_theme_mod( 'storefront_woocommerce_styles', $this->get_woocommerce_css() ); wc_deprecated_function( __FUNCTION__, '2.3.1' );
} else {
_deprecated_function( __FUNCTION__, '2.3.1' );
}
} }
/** /**
* Add CSS in <head> for styles handled by the theme customizer * Add CSS in <head> for styles handled by the theme customizer
* If the Customizer is active pull in the raw css. Otherwise pull in the prepared theme_mods if they exist.
* *
* @since 1.0.0 * @since 1.0.0
* @return void * @return void
*/ */
public function add_customizer_css() { public function add_customizer_css() {
$storefront_styles = get_theme_mod( 'storefront_styles' ); wp_add_inline_style( 'storefront-style', $this->get_css() );
$storefront_woocommerce_styles = get_theme_mod( 'storefront_woocommerce_styles' ); wp_add_inline_style( 'storefront-woocommerce-style', $this->get_woocommerce_css() );
if ( is_customize_preview() || ( defined( 'WP_DEBUG' ) && true === WP_DEBUG ) || ( false === $storefront_styles && false === $storefront_woocommerce_styles ) ) {
wp_add_inline_style( 'storefront-style', $this->get_css() );
wp_add_inline_style( 'storefront-woocommerce-style', $this->get_woocommerce_css() );
} else {
wp_add_inline_style( 'storefront-style', get_theme_mod( 'storefront_styles' ) );
wp_add_inline_style( 'storefront-woocommerce-style', get_theme_mod( 'storefront_woocommerce_styles' ) );
}
} }
/** /**

18
inc/woocommerce/class-storefront-woocommerce.php
View file

@ -42,9 +42,6 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
// Integrations. // Integrations.
add_action( 'wp_enqueue_scripts', array( $this, 'woocommerce_integrations_scripts' ), 99 ); add_action( 'wp_enqueue_scripts', array( $this, 'woocommerce_integrations_scripts' ), 99 );
add_action( 'wp_enqueue_scripts', array( $this, 'add_customizer_css' ), 140 ); add_action( 'wp_enqueue_scripts', array( $this, 'add_customizer_css' ), 140 );
add_action( 'after_switch_theme', array( $this, 'set_storefront_style_theme_mods' ) );
add_action( 'customize_save_after', array( $this, 'set_storefront_style_theme_mods' ) );
} }
/** /**
@ -55,23 +52,22 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* @return void * @return void
*/ */
public function add_customizer_css() { public function add_customizer_css() {
$storefront_woocommerce_extension_styles = get_theme_mod( 'storefront_woocommerce_extension_styles' ); wp_add_inline_style( 'storefront-woocommerce-style', $this->get_woocommerce_extension_css() );
if ( is_customize_preview() || ( defined( 'WP_DEBUG' ) && true === WP_DEBUG ) || ( false === $storefront_woocommerce_extension_styles ) ) {
wp_add_inline_style( 'storefront-woocommerce-style', $this->get_woocommerce_extension_css() );
} else {
wp_add_inline_style( 'storefront-woocommerce-style', $storefront_woocommerce_extension_styles );
}
} }
/** /**
* Assign styles to individual theme mod. * Assign styles to individual theme mod.
* *
* @deprecated 2.3.1
* @since 2.1.0 * @since 2.1.0
* @return void * @return void
*/ */
public function set_storefront_style_theme_mods() { public function set_storefront_style_theme_mods() {
set_theme_mod( 'storefront_woocommerce_extension_styles', $this->get_woocommerce_extension_css() ); if ( function_exists( 'wc_deprecated_function' ) ) {
wc_deprecated_function( __FUNCTION__, '2.3.1' );
} else {
_deprecated_function( __FUNCTION__, '2.3.1' );
}
} }
/** /**