Conditionally include styles

Author: ajaydsouza

includes/public/public.php

@@ -34,8 +34,12 @@ function wzkb_lang_init() {
 function wpkb_enqueue_styles() {
 
 	wp_register_style( 'wzkb_styles', WZKB_PLUGIN_URL . 'includes/public/css/wzkb-styles.min.css', array( 'dashicons' ), '1.0' );
-	if ( wzkb_get_option( 'include_styles' ) ) {
-		wp_enqueue_style( 'wzkb_styles' );
+
+	if ( is_singular() ) {
+		$id = get_the_ID();
+		if ( has_block( 'knowledgebase/knowledgebase', $id ) && wzkb_get_option( 'include_styles' ) ) {
+			wp_enqueue_style( 'wzkb_styles' );
+		}
 	}
 
 	wp_add_inline_style( 'wzkb_styles', esc_html( wzkb_get_option( 'custom_css' ) ) );
@@ -44,13 +48,6 @@ function wpkb_enqueue_styles() {
 		$extra_styles = '#wzkb-sidebar-primary{width:25%;}#wzkb-content-primary{width:75%;float:left;}';
 		wp_add_inline_style( 'wzkb_styles', $extra_styles );
 	}
-
-	if ( is_singular() ) {
-		$id = get_the_ID();
-		if ( has_block( 'knowledgebase/knowledgebase', $id ) ) {
-			wp_enqueue_style( 'wzkb_styles' );
-		}
-	}
 }
 add_action( 'wp_enqueue_scripts', 'wpkb_enqueue_styles' );
 

includes/public/templates/archive-wz_knowledgebase.php

@@ -16,8 +16,9 @@
 /* This plugin uses the Archive file of TwentySeventeen theme as an example */
 get_header();
 
-wp_enqueue_style( 'wzkb_styles' );
-
+if ( wzkb_get_option( 'include_styles' ) ) {
+	wp_enqueue_style( 'wzkb_styles' );
+}
 ?>
 <div class="wrap">
 	<div id="wzkb-content-primary" class="content-area">

includes/public/templates/single-wz_knowledgebase.php

@@ -16,8 +16,9 @@
 /* This plugin uses the Archive file of TwentySeventeen theme as an example */
 get_header();
 
-wp_enqueue_style( 'wzkb_styles' );
-
+if ( wzkb_get_option( 'include_styles' ) ) {
+	wp_enqueue_style( 'wzkb_styles' );
+}
 ?>
 <div class="wrap">
 	<div id="wzkb-content-primary" class="content-area">

includes/public/templates/wzkb-search.php

@@ -32,8 +32,9 @@
 /* This plugin uses the Archive file of TwentyFifteen theme as an example */
 get_header();
 
-wp_enqueue_style( 'wzkb_styles' );
-
+if ( wzkb_get_option( 'include_styles' ) ) {
+	wp_enqueue_style( 'wzkb_styles' );
+}
 ?>
 <div class="wrap">
 	<div id="wzkb-content-primary" class="content-area">

includes/shortcode.php

@@ -26,9 +26,9 @@
  */
 function wzkb_shortcode( $atts, $content = null ) {
 
-	wp_enqueue_style( 'wzkb_styles' );
-	wp_enqueue_style( 'dashicons' );
-
+	if ( wzkb_get_option( 'include_styles' ) ) {
+		wp_enqueue_style( 'wzkb_styles' );
+	}
 	$atts = shortcode_atts(
 		array(
 			'category'     => false,
@@ -135,7 +135,9 @@ function wzkb_shortcode_breadcrumb( $atts, $content = null ) {
  */
 function wzkb_shortcode_alert( $atts, $content = null ) {
 
-	wp_enqueue_style( 'wzkb_styles' );
+	if ( wzkb_get_option( 'include_styles' ) ) {
+		wp_enqueue_style( 'wzkb_styles' );
+	}
 
 	$atts = shortcode_atts(
 		array(