Merge branch 'release/v1.2'

highrisedigital · Dec 7, 2023 · 7255f76 · 7255f76
2 parents 8219d88 + b1362a4
commit 7255f76
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 20 deletions.
diff --git a/assets/js/better-core-video-embeds.js b/assets/js/better-core-video-embeds.js
@@ -1,6 +1,6 @@
 // loop through each of the hd core embed wrapper elements on the page.
 // these are the elements that should contain the thumbnail.
-document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
+document.querySelectorAll( '.hd-bcve-wrapper-js' ).forEach(( el, i ) => {
 
 	// get the associated template element which holds the embed code.
 	// it is the next element after the wrapper.
@@ -70,4 +70,4 @@ document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
 
 	});
 
-});
+});
diff --git a/assets/js/better-core-video-embeds.min.js b/assets/js/better-core-video-embeds.min.js
diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
@@ -34,15 +34,19 @@ function hd_bcve_plugins_loaded() {
  */
 function hd_bcve_enqueue_scripts() {
 
-	// enqueue the front end script to invoking the video embed on image click.
-	wp_enqueue_script(
-		'better-core-video-embeds-js',
-		HD_BCVE_LOCATION_URL . '/assets/js/better-core-video-embeds.min.js',
-		false,
-		false,
-		true
-	);
+	// only if the page has a core embed block present.
+	if ( has_block( 'core/embed' ) ) {
+
+		// enqueue the front end script to invoking the video embed on image click.
+		wp_enqueue_script(
+			'better-core-video-embeds-js',
+			HD_BCVE_LOCATION_URL . '/assets/js/better-core-video-embeds.min.js',
+			false,
+			false,
+			true
+		);
 
+	}
 }
 
 add_action( 'wp_enqueue_scripts', 'hd_bcve_enqueue_scripts' );
@@ -52,11 +56,16 @@ function hd_bcve_enqueue_scripts() {
  */
 function hd_bcve_register_block_style() {
 
-	// register the style for this block.
-	wp_enqueue_style(
-		'better-core-video-embeds-styles',
-		HD_BCVE_LOCATION_URL . '/assets/css/better-core-video-embeds.min.css'
-	);
+	// only if the page has a core embed block present.
+	if ( has_block( 'core/embed' ) ) {
+
+		// register the style for this block.
+		wp_enqueue_style(
+			'better-core-video-embeds-styles',
+			HD_BCVE_LOCATION_URL . '/assets/css/better-core-video-embeds.min.css'
+		);
+
+	}
 
 }
 
@@ -184,6 +193,7 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 	$wrapper_classes = [
 		'wp-block-image',
 		'hd-bcve-wrapper',
+		'hd-bcve-wrapper-js',
 		'is--' . $block['attrs']['providerNameSlug'],
 	];
 
@@ -207,7 +217,7 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 	}
 
 	// allow the classes to be filtered.
-	$wrapper_classes = apply_filters( '', $wrapper_classes, $block, $video_id, $thumbnail_url );
+	$wrapper_classes = apply_filters( 'hd_bcve_wrapper_classes', $wrapper_classes, $block, $video_id, $thumbnail_url );
 
 	// buffer the output as we need to return not echo.
 	ob_start();

diff --git a/readme.txt b/readme.txt
@@ -3,9 +3,9 @@ Contributors: highrisedigital,wpmarkuk
 Donate link: https://example.com/
 Tags: embed, oembed, youtube, vimeo, performance, blocks
 Requires at least: 6.0
-Tested up to: 6.1.1
-Stable tag: 1.1.3
-Requires PHP: 7.0
+Tested up to: 6.4.2
+Stable tag: 1.2
+Requires PHP: 8.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -45,6 +45,10 @@ The plugin provides progressive enhancement, therefore if you no longer use this
 
 == Changelog ==
 
+= 1.2 (07/12/2023) =
+* Add a name for the wrapper CSS filter which was missing.
+* JS and CSS target using different classes.
+
 = 1.1.4 (22/02/2023) =
 * Load the CSS and JS on all pages. Fixes problems when post content is output on templates such as archives. Found when using full site editing and the query block.