fix : adjust setting&function

vektor-inc · Dec 1, 2022 · f900714 · f900714
1 parent da2f20f
commit f900714
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 97 deletions.
diff --git a/inc/vk-blocks-pro/vk-blocks-pro-functions.php b/inc/vk-blocks-pro/vk-blocks-pro-functions.php
@@ -29,11 +29,5 @@ function vk_blocks_pro_load_scripts() {
 
 	// Animation Block
 	wp_enqueue_script( 'vk-blocks-animation', VK_BLOCKS_DIR_URL . 'build/vk-animation.min.js', array(), VK_BLOCKS_VERSION, true );
-
-	// Slider Block
-	global $vk_swiper_url;
-	wp_enqueue_style( 'vk-swiper-style', $vk_swiper_url . 'assets/css/swiper.min.css', array(), SWIPER_VERSION );
-
-	wp_enqueue_script( 'vk-blocks-slider', VK_BLOCKS_DIR_URL . 'build/vk-slider.min.js', array( 'vk-swiper-script' ), VK_BLOCKS_VERSION, true );
 }
-add_action( 'wp_enqueue_scripts', 'vk_blocks_pro_load_scripts' );
+add_action( 'wp_enqueue_scripts', 'vk_blocks_pro_load_scripts' );
diff --git a/inc/vk-blocks/class-vk-blocks-global-settings.php b/inc/vk-blocks/class-vk-blocks-global-settings.php
@@ -93,6 +93,14 @@ public static function blocks() {
 				'name'   => 'pr-content',
 				'is_pro' => false,
 			),
+			array(
+				'name'   => 'slider',
+				'is_pro' => false,
+			),
+			array(
+				'name'   => 'slider-item',
+				'is_pro' => false,
+			),
 			array(
 				'name'   => 'spacer',
 				'is_pro' => false,
@@ -189,14 +197,6 @@ public static function blocks() {
 				'name'   => 'select-post-list-item',
 				'is_pro' => true,
 			),
-			array(
-				'name'   => 'slider',
-				'is_pro' => true,
-			),
-			array(
-				'name'   => 'slider-item',
-				'is_pro' => true,
-			),
 			array(
 				'name'   => 'step',
 				'is_pro' => true,
@@ -221,4 +221,4 @@ public static function blocks() {
 		return $blocks;
 	}
 
-}
+}
diff --git a/inc/vk-blocks/vk-blocks-functions.php b/inc/vk-blocks/vk-blocks-functions.php
@@ -224,3 +224,13 @@ function vk_blocks_set_wp_version() {
 	}
 	add_action( 'admin_head', 'vk_blocks_set_wp_version', 10, 0 );
 }
+
+function vk_blocks_load_scripts() {
+
+	// Slider Block
+	global $vk_swiper_url;
+	wp_enqueue_style( 'vk-swiper-style', $vk_swiper_url . 'assets/css/swiper.min.css', array(), SWIPER_VERSION );
+
+	wp_enqueue_script( 'vk-blocks-slider', VK_BLOCKS_DIR_URL . 'build/vk-slider.min.js', array( 'vk-swiper-script' ), VK_BLOCKS_VERSION, true );
+}
+add_action( 'wp_enqueue_scripts', 'vk_blocks_load_scripts' );
diff --git a/src/blocks/slider-item/index.php b/src/blocks/slider-item/index.php
@@ -15,7 +15,7 @@ function vk_blocks_register_block_slider_item() {
 	if ( ! is_admin() ) {
 		wp_register_style(
 			'vk-blocks/slider-item',
-			VK_BLOCKS_DIR_URL . 'build/_pro/slider-item/style.css',
+			VK_BLOCKS_DIR_URL . 'build/slider-item/style.css',
 			array(),
 			VK_BLOCKS_VERSION
 		);
@@ -30,4 +30,4 @@ function vk_blocks_register_block_slider_item() {
 		)
 	);
 }
-add_action( 'init', 'vk_blocks_register_block_slider_item', 99 );
+add_action( 'init', 'vk_blocks_register_block_slider_item', 99 );
diff --git a/src/blocks/slider/index.php b/src/blocks/slider/index.php
@@ -15,7 +15,7 @@ function vk_blocks_register_block_slider() {
 	if ( ! is_admin() ) {
 		wp_register_style(
 			'vk-blocks/slider',
-			VK_BLOCKS_DIR_URL . 'build/_pro/slider/style.css',
+			VK_BLOCKS_DIR_URL . 'build/slider/style.css',
 			array( 'vk-swiper-style' ),
 			VK_BLOCKS_VERSION
 		);
@@ -42,4 +42,4 @@ function vk_blocks_register_block_slider() {
 		)
 	);
 }
-add_action( 'init', 'vk_blocks_register_block_slider', 99 );
+add_action( 'init', 'vk_blocks_register_block_slider', 99 );