From d007cdb8c73fa87336bbbaac6ad72eaa9df2f9e3 Mon Sep 17 00:00:00 2001
From: Erik Golinelli <erik@codekraft.it>
Date: Sun, 5 Nov 2023 01:26:37 +0100
Subject: [PATCH] chore

---
 functions.php                     | 6 +++---
 inc/enqueue-scripts.php           | 4 ++--
 inc/enqueue-style.php             | 6 +++---
 src/scripts/modules/grid/index.ts | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/functions.php b/functions.php
index 8b35a1ff..1d78c2dd 100644
--- a/functions.php
+++ b/functions.php
@@ -63,11 +63,11 @@
 }
 
 require_once MODULR_THEME_DIR . '/inc/theme-setup.php';
-require_once MODULR_THEME_DIR . '/inc/enqueue-scripts.php';
 require_once MODULR_THEME_DIR . '/inc/template-functions.php';
 require_once MODULR_THEME_DIR . '/inc/customizer.php';
-require_once MODULR_THEME_DIR . '/inc/sidebar.php';
+require_once MODULR_THEME_DIR . '/inc/enqueue-scripts.php';
 require_once MODULR_THEME_DIR . '/inc/enqueue-style.php';
-require_once MODULR_THEME_DIR . '/inc/block-styles.php';
 require_once MODULR_THEME_DIR . '/inc/enqueue-fonts.php';
+require_once MODULR_THEME_DIR . '/inc/sidebar.php';
+require_once MODULR_THEME_DIR . '/inc/block-styles.php';
 require_once MODULR_THEME_DIR . '/inc/woocommerce.php';
diff --git a/inc/enqueue-scripts.php b/inc/enqueue-scripts.php
index 81ecd705..1c98e7fb 100644
--- a/inc/enqueue-scripts.php
+++ b/inc/enqueue-scripts.php
@@ -11,8 +11,8 @@ function modul_r_theme_scripts() {
 		$asset = include MODULR_THEME_DIR . '/build/modulr-scripts.asset.php';
 
 		/* Register and Enqueue */
-		wp_enqueue_script( 'modul-r-scripts-main', MODULR_THEME_URL . '/build/modulr-scripts.js', $asset['dependencies'], $asset['version'] );
-		wp_enqueue_style( 'modul-r-scripts-main', MODULR_THEME_URL . '/build/modulr-scripts.css', $asset['dependencies'], $asset['version'] );
+		wp_enqueue_script( 'modul-r-scripts', MODULR_THEME_URL . '/build/modulr-scripts.js', $asset['dependencies'], $asset['version'], true );
+		wp_enqueue_style( 'modul-r-scripts', MODULR_THEME_URL . '/build/modulr-scripts.css', array(), $asset['version'] );
 	}
 endif;
 add_action( 'wp_enqueue_scripts', 'modul_r_theme_scripts' ); // Add Theme admin scripts
diff --git a/inc/enqueue-style.php b/inc/enqueue-style.php
index 4597aa65..b12e9073 100644
--- a/inc/enqueue-style.php
+++ b/inc/enqueue-style.php
@@ -12,7 +12,7 @@ function modul_r_atf_css() {
 		$atf_css = ob_get_clean();
 
 		if ( ! empty( $atf_css ) ) {
-			echo '<style id="modul-r-above-the-fold">' . $atf_css . '</style>';
+			echo '<style id="modul-r-style-above-the-fold">' . $atf_css . '</style>';
 		}
 	}
 endif;
@@ -22,7 +22,7 @@ function modul_r_atf_css() {
  */
 if ( ! function_exists( 'modul_r_atf_style' ) ) :
 	function modul_r_atf_style() {
-		wp_enqueue_style( 'modul-r-above-the-fold', MODULR_THEME_URL . '/build/modulr-css-atf.css' );
+		wp_enqueue_style( 'modul-r-style-above-the-fold', MODULR_THEME_URL . '/build/modulr-css-atf.css' );
 	}
 endif;
 
@@ -41,7 +41,7 @@ function modul_r_theme_style() {
  */
 if ( ! function_exists( 'modul_r_admin_style' ) ) :
 	function modul_r_admin_style() {
-		wp_enqueue_style( 'modul-r-admin', MODULR_THEME_URL . '/build/modulr-css-admin.css' );
+		wp_enqueue_style( 'modul-r-style-admin', MODULR_THEME_URL . '/build/modulr-css-admin.css' );
 	}
 endif;
 
diff --git a/src/scripts/modules/grid/index.ts b/src/scripts/modules/grid/index.ts
index 66ddd84d..664da44e 100644
--- a/src/scripts/modules/grid/index.ts
+++ b/src/scripts/modules/grid/index.ts
@@ -101,10 +101,6 @@ export async function modulrGrid(): Promise< void > {
 				const clickedItemAnchor =
 					clickedItem.firstChild as HTMLAnchorElement;
 
-				const category = getLastElementFromHref(
-					clickedItemAnchor?.href
-				);
-
 				if ( clickedItem?.classList.contains( 'current-cat' ) ) {
 					toggleCategoryVisiblity( grid, null, forceGridAnimation );
 					// the main button cannot be disabled
@@ -114,6 +110,10 @@ export async function modulrGrid(): Promise< void > {
 					clickedItem.classList.remove( 'current-cat' );
 					gridButtons[ 0 ].classList.add( 'current-cat' );
 				} else {
+					const category = getLastElementFromHref(
+						clickedItemAnchor?.href
+					);
+
 					// remove the active class from sibling buttons
 					gridButtons.forEach( ( el ) => {
 						el.classList.remove( 'current-cat' );