Merge branch 'release/v1.1.2'

assets/css/better-core-video-embeds.css

@@ -1,11 +1,11 @@
 .hd-bcve-wrapper {
 	position: relative;
-	cursor: pointer;
 }
 .hd-bcve-thumbnail {
 	height: auto;
 	max-width: 100%;
 	width: 100%;
+	cursor: pointer;
 }
 .hd-bcve-wrapper .play-button {
     --hd-play-button-size: 80px;
@@ -19,6 +19,7 @@
     z-index: 2;
     width: var(--hd-play-button-size);
     height: var(--hd-play-button-size);
+	cursor: pointer;
 }
 .hd-bcve-wrapper .play-button:after {
 	--hd-play-button-opacity: .8;

assets/js/better-core-video-embeds.js

@@ -2,11 +2,9 @@
 // these are the elements that should contain the thumbnail.
 document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
 
-	// get the youtube video id for the data attribute on the wrapper.
-	var videoId = el.getAttribute( 'data-id' );
-
 	// get the associated template element which holds the embed code.
-	var template = document.querySelector( '#hd-bcve-embed-html-' + videoId );
+	// it is the next element after the wrapper.
+	var template = el.nextElementSibling;
 
 	/**
 	 * Add autoplay on the iframe as well as loading from youtube no cookie.
@@ -24,39 +22,51 @@ document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
 	// set an allows attribute on the iframe with an autoplay value.
 	iframe.setAttribute( 'allow', 'autoplay' );
 
-	// get the text content of the embed element - this is the caption.
-	var caption = template.content.textContent.trim();
+	// get the first child of the figure - the caption.
+	var caption = template.content.children[0].querySelector( 'figcaption' );
 
 	// if we have a caption.
-	if ( '' !== caption ) {
+	if ( caption ) {
 
 		// create an element for the embed caption.
 		var captionEl = document.createElement('figcaption');
 		captionEl.classList.add( 'wp-element-caption' );
-		captionEl.textContent = caption;
+		captionEl.innerHTML = caption.innerHTML;
 
 		// add the caption, after the thumbnail.
 		el.append( captionEl );
 
 	}
 
-	// when the wrapper is clicked.
-	el.addEventListener( 'click', () => {
+	// create an array for storing the click event elements.
+	var clickEls = [];
 
-		// clone the template element.
-		var contentOuter = template.content.cloneNode( true );
-
-		// grab just the first child of the template - this is the figure block element which wraps the iframe.
-		var content = contentOuter.children[0];
+	// grab the thumbnail and play button of this embed.
+	clickEls.push( el.querySelector( '.hd-bcve-thumbnail' ) );
+	clickEls.push( el.querySelector( '.play-button' ) );
 
-		// add the iframe embed content before the embed wrapper.
-		el.before( content );
+	// loop through each click event - play button and thumbnail.
+	clickEls.forEach(( clickEls, i ) => {
 
-		// remove the embed wrapper including thumbnail.
-		el.remove();
+		// when the element is clicked.
+		clickEls.addEventListener( 'click', () => {
 
-		// remove the template item which holds the iframe.
-		template.remove();
+			// clone the template element.
+			var contentOuter = template.content.cloneNode( true );
+
+			// grab just the first child of the template - this is the figure block element which wraps the iframe.
+			var content = contentOuter.children[0];
+
+			// add the iframe embed content before the embed wrapper.
+			el.before( content );
+
+			// remove the embed wrapper including thumbnail.
+			el.remove();
+
+			// remove the template item which holds the iframe.
+			template.remove();
+
+		});
 
 	});
 

better-core-video-embeds.php

@@ -4,7 +4,7 @@
 Description: A plugin which enhances the core video embeds for Youtube and Vimeo videos by not loading unnecessary scripts until they are needed.
 Requires at least: 6.0
 Requires PHP: 7.0
-Version: 1.1.1
+Version: 1.1.2
 Author: Highrise Digital
 Author URI: https://highrise.digital/
 License: GPL-2.0-or-later
@@ -392,11 +392,12 @@ function hd_job_allowed_innerblock_html() {
 
 	/**
 	 * Return the allowed html
-	 * These are the elements in the rendered embed block for youtube and vimeo videos.
+	 * These are the elements in the rendered embed block for supported videos.
+	 * This also includes everything you can add to an embed caption.
 	 * Therefore we need to allow these to keep the same structure.
 	 */
 	return [
-		'iframe' => [
+		'iframe'     => [
 			'src'             => true,
 			'height'          => true,
 			'width'           => true,
@@ -409,9 +410,31 @@ function hd_job_allowed_innerblock_html() {
 		'figcaption' => [
 			'class' => true,
 		],
-		'div'    => [
+		'div'       => [
 			'class' => true,
-		]
+		],
+		'a'         => [
+			'class'      => true,
+			'href'       => true,
+			'data-type'  => true,
+		],
+		'strong'    => [],
+		'em'        => [],
+		'sub'       => [],
+		'sup'       => [],
+		's'         => [],
+		'kbd'       => [],
+		'img'       => [
+			'class' => true,
+			'style' => true,
+			'src'   => true,
+			'alt'   => true,
+		],
+		'code'      => [],
+		'mark'      => [
+			'style' => true,
+			'class' => true,
+		],
 	];
 
 }

readme.txt

@@ -1,10 +1,10 @@
 === Better Core Video Embeds ===
 Contributors: highrisedigital,wpmarkuk
 Donate link: https://example.com/
-Tags: embed, oembed, youtube, vimeo
+Tags: embed, oembed, youtube, vimeo, performance, blocks
 Requires at least: 6.0
 Tested up to: 6.1.1
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -13,11 +13,11 @@ A plugin which enhances the core embed block for Youtube, Daily Motion and Vimeo
 
 == Description ==
 
-This plugin provides page optimisations for pages and posts which have embedded Youtube or Vimeo videos which have been added using the core embed block.
+This plugin provides page optimisations for pages and posts which have embedded Youtube, Vimeo or Daily Motion videos which have been added using the core embed block.
 
-Without this plugin, when using the core embed block, when your page loads, lots of Youtube and/or Vimeo scripts and styles are loaded, regardless of whether a visitor actually interacts with the embedded video.
+Without this plugin, when using the core embed block, when your page loads, lots of external scripts and styles are loaded from the embed service, regardless of whether a visitor actually interacts with the embedded video.
 
-This plugin prevents these scripts and styles from loading until the user actually interacts with the video. It does this by replacing the video embed, on page load with the video thumbnail image (added on Youtube or Vimeo). When a user clicks the thumbnail the embedded video, along with associated scripts and styles in then loaded.
+This plugin prevents these scripts and styles from loading until the user actually interacts with the video. It does this by replacing the video embed, on page load with the video thumbnail image (added on Youtube, Vimeo or Daily Motion). When a user clicks the thumbnail the embedded video, along with associated scripts and styles are loaded.
 
 https://www.youtube.com/watch?v=k7A2kZWUb9Q
 
@@ -45,6 +45,10 @@ The plugin provides progressive enhancement, therefore if you no longer use this
 
 == Changelog ==
 
+= 1.1.2 (18/01/2023) =
+* Allow HTML allowed in a caption to be used with videos. Previously HTML was stripped from the caption.
+* Ensure that any links added to embed captions are clickable.
+
 = 1.1.1 (20/12/2022) =
 * Fixed a bug where the <figcaption> element was removed when the video thumbnail was clicked.