Merge branch 'trunk' into fix/email-styles

Automattic · Apr 23, 2024 · be0c332 · be0c332
2 parents ce2fb46 + 41752e5
commit be0c332
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/assets/js/frontend/course-video/videopress-extension.js b/assets/js/frontend/course-video/videopress-extension.js
@@ -26,6 +26,8 @@ const initVideoPressPlayer = ( iframe ) => {
 
 export const initVideoPressExtension = () => {
 	document
-		.querySelectorAll( '.wp-block-embed-videopress iframe' )
+		.querySelectorAll(
+			'.wp-block-embed-videopress iframe, .wp-block-jetpack-videopress iframe'
+		)
 		.forEach( initVideoPressPlayer );
 };
diff --git a/assets/shared/helpers/player/use-editor-player.js b/assets/shared/helpers/player/use-editor-player.js
@@ -162,8 +162,10 @@ const useEditorPlayer = ( videoBlock ) => {
 		const doc = editorCanvasIframe?.contentDocument || document;
 		const w = editorCanvasIframe?.contentWindow || window;
 
-		const isJetpackVideoPress = !! videoBlock.attributes
-			.videoPressClassNames;
+		const isJetpackVideoPress =
+			!! videoBlock.attributes.videoPressClassNames ||
+			// VideoPress block (previously VideoPress used the video block).
+			'videopress/video' === videoBlock.name;
 
 		// Video file block.
 		if ( 'core/video' === videoBlock.name && ! isJetpackVideoPress ) {

diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	presets: [ '@wordpress/default' ],
+};
diff --git a/changelog/add-new-videopress-block-support b/changelog/add-new-videopress-block-support
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Add VideoPress block compabitility for the video settings on courses
diff --git a/includes/course-video/class-sensei-course-video-settings.php b/includes/course-video/class-sensei-course-video-settings.php
@@ -133,7 +133,7 @@ public function enqueue_frontend_scripts() {
 		wp_add_inline_script( 'sensei-course-video-blocks-extension', $script, 'before' );
 
 		$post = get_post();
-		if ( has_block( 'core/video', $post ) || has_block( 'core/embed', $post ) ) {
+		if ( has_block( 'core/video', $post ) || has_block( 'core/embed', $post ) || has_block( 'videopress/video', $post ) ) {
 			Sensei()->assets->enqueue_script( 'sensei-course-video-blocks-extension' );
 		}
 	}

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -86,6 +86,7 @@
 		<properties>
 			<property name="custom_capabilities" type="array">
 				<element value="manage_sensei"/>
+				<element value="edit_course"/>
 			</property>
 		</properties>
 	</rule>