use breakpoints property, add individual checks

Author: kaeizen

src/dynamic-breakpoints.php

@@ -23,6 +23,8 @@ function stackable_get_responsive_css() {
 if ( ! class_exists( 'Stackable_Dynamic_Breakpoints' ) ) {
 	class Stackable_Dynamic_Breakpoints {
 
+		private $dynamic_breakpoints = false;
+
 		/**
 		 * Add our hooks.
 		 */
@@ -35,14 +37,6 @@ function __construct() {
 				// Add a filter for replacing shortcut media queries before the breakpoint adjustment.
 				add_filter( 'stackable_frontend_css', array( $this, 'replace_shortcut_media_queries' ), 9 );
 
-				// This make sure all add_filter( 'stackable_responsive_breakpoints' , callback ) are called
-				// before getting the dynamic breakpoints
-				add_action('after_setup_theme', array( $this, 'setup_frontend_breakpoints') );
-			}
-		}
-
-		function setup_frontend_breakpoints() {
-			if ( $this->has_custom_breakpoints() ) {
 				// Add our filter that adjusts all CSS that we print out.
 				add_filter( 'stackable_frontend_css', array( $this, 'adjust_breakpoints' ) );
 
@@ -79,7 +73,8 @@ public function get_dynamic_breakpoints() {
 				}
 			}
 
-			return $breakpoints;
+			$this->dynamic_breakpoints = $breakpoints;
+			return $this->dynamic_breakpoints;
 		}
 
 		/**
@@ -127,7 +122,10 @@ public function sanitize_array_setting( $input ) {
 		 * @return boolean
 		 */
 		public function has_custom_breakpoints() {
-			$breakpoints = $this->get_dynamic_breakpoints();
+			$breakpoints = $this->dynamic_breakpoints;
+			if ( $breakpoints == false ) {
+				$breakpoints = $this->get_dynamic_breakpoints();
+			}
 			return ! empty( $breakpoints['tablet'] ) || ! empty( $breakpoints['mobile'] );
 		}
 
@@ -151,7 +149,11 @@ public function replace_shortcut_media_queries( $css ) {
 		 * @return String adjusted CSS
 		 */
 		public function adjust_breakpoints( $css ) {
-			$breakpoints = $this->get_dynamic_breakpoints();
+			if ( ! $this->has_custom_breakpoints() ) {
+				return $css;
+			}
+
+			$breakpoints = $this->dynamic_breakpoints;
 			$new_tablet = $breakpoints['tablet'];
 			$new_mobile = $breakpoints['mobile'];
 
@@ -200,6 +202,10 @@ public function adjust_breakpoints( $css ) {
 		 * @return void
 		 */
 		public function enqueue_adjusted_responsive_css() {
+			if ( ! $this->has_custom_breakpoints() ) {
+				return;
+			}
+
 			$css = stackable_get_responsive_css();
 			$css = apply_filters( 'stackable_frontend_css', $css );
 			wp_add_inline_style( 'ugb-style-css', $css );
@@ -215,6 +221,10 @@ public function enqueue_adjusted_responsive_css() {
 		 * @return void
 		 */
 		public function adjust_block_styles( $block_content, $block ) {
+			if ( ! $this->has_custom_breakpoints() ) {
+				return $block_content;
+			}
+
 			if ( $block_content === null ) {
 				return $block_content;
 			}