Changeset 2892031

Timestamp:

04/01/2023 11:31:37 PM (16 months ago)

Author:

celloexpressions

Message:

Sheet Music Library: Additional handling to merge class names and address functions that run in both block and non-block contexts. General QC updates.

Location:

sheet-music-library/trunk/template

Files:

• template-filters.php (modified) (5 diffs)
• template-parts.php (modified) (10 diffs)

sheet-music-library/trunk/template/template-filters.php

@@ -17 +17 @@
     $no_download_message = get_post_meta( get_the_ID(), 'no-download-message', true );
     $button_text = ( $no_download_message ) ? __( 'View Piece →', 'sheet-music-library' ) : __( 'View & Download →', 'sheet-music-library' );
-    
+
     ob_start();
     ?>
@@ -71 +71 @@
 
     $video_url = esc_url( get_post_meta( get_the_ID(), 'piece-video-url', true ) );
-    
+
     $no_download_message = get_post_meta( get_the_ID(), 'no-download-message', true );
     $no_download_message = wp_kses( $no_download_message, array(
@@ -134 +134 @@
 // Filter post titles in archive contexts
 function sml_post_title_filter( $title, $post_id ) {
-    if ( 'sheet_music' === get_post_type() && ! current_theme_supports( 'sheet_music_library' ) ) {
-        if ( ! is_singular() ) {
-            $no_download_message = get_post_meta( $post_id, 'no-download-message', true );
-            if ( $no_download_message ) {
-                if ( ! is_admin() ) {
-                    $title = '<span class="sml-restricted"></span>' . $title;
-                } else {
-                    $title = '* ' . $title;
-                }
+    if ( 'sheet_music' === get_post_type( $post_id ) ) {
+        $no_download_message = get_post_meta( $post_id, 'no-download-message', true );
+        if ( $no_download_message ) {
+            if ( ! is_admin() ) {
+                $title = '<span class="sml-restricted"></span>' . $title;
+            } else {
+                $title = '* ' . $title;
             }
         }
@@ -151 +149 @@
 // All sheet music shortcode.
 function sml_shortcode_all_sheet_music() {
-    $pieces = get_posts( array( 
+    $pieces = get_posts( array(
         'numberposts' => '-1',
         'post_type' => 'sheet_music',
@@ -163 +161 @@
         'number' => 10,
     ), $attrs );
-    $pieces = get_posts( array( 
+    $pieces = get_posts( array(
         'numberposts' => absint( $a['number'] ),
         'post_type' => 'sheet_music',

sheet-music-library/trunk/template/template-parts.php

@@ -19 +19 @@
 
 // Returns markup for the download buttons and terms.
-function sml_sheet_music_download_box( $score_url, $parts_url, $no_download_message ) {
+function sml_sheet_music_download_box( $score_url, $parts_url, $no_download_message ) {
     
     // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
-    $wrapper_attributes = get_block_wrapper_attributes();
-
-    ob_start();
-    ?><div class="download-box" <?php echo $wrapper_attributes; ?>>
+    if ( null === $block_attributes ) {
+        $wrapper_attributes = 'class="download-box"';
+    } else {
+        $wrapper_attributes = get_block_wrapper_attributes(['class' => 'download-box']);
+    }
+
+    ob_start();
+    ?><div <?php echo $wrapper_attributes; ?>>
         <?php 
     if ( '' === $score_url && '' === $parts_url && '' === $no_download_message ) {
@@ -81 +85 @@
 
 // Returns markup for the download buttons and terms for the current post.
-function sml_sheet_music_download_box_current() {
+// Block attributes is provided when this is run as a block render_callback.
+function sml_sheet_music_download_box_current( $block_attributes = null ) {
 
     // Get post meta fields' data.
@@ -105 +110 @@
     ) );
 
-    return sml_sheet_music_download_box( $score_url, $parts_url, $no_download_message );
+    return sml_sheet_music_download_box( $score_url, $parts_url, $no_download_message );
 }
 
 
 // Returns markup for a linked preview image for the current sheet music piece.
-function sml_score_preview_current() {
-
-    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
-    $wrapper_attributes = get_block_wrapper_attributes();
+function sml_score_preview_current( $block_attributes = null ) {
+
+    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
+    if ( null === $block_attributes ) {
+        $wrapper_attributes = 'class="piece-preview"';
+    } else {
+        $wrapper_attributes = get_block_wrapper_attributes(['class' => 'piece-preview']);
+    }
 
     // Get post meta fields' data.
@@ -128 +137 @@
 
     if ( $image_url && ! $no_download_message ) { ?>
-        <div class="piece-preview" <?php echo $wrapper_attributes; ?>>
+        <div <?php echo $wrapper_attributes; ?>>
             <a href="<?php echo $score_url; ?>" target="_blank"><img class="score-preview" src="<?php echo $image_url; ?>" alt="score preview"/></a>
         </div>
@@ -135 +144 @@
         // Dynamic blocks in the editor are rendered through REST API, frontend blocks are called directly.
         elseif ( defined( 'REST_REQUEST' ) && REST_REQUEST ) { ?>
-        <div class="piece-preview" <?php echo $wrapper_attributes; ?>>
+        <div <?php echo $wrapper_attributes; ?>>
             <div class="score-preview placeholder">
                 <?php 
@@ -155 +164 @@
 
 // Returns markup for a button-link to a single piece from an archive excerpt view.
-function sml_excerpt_button_current() {
-    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
-    $wrapper_attributes = get_block_wrapper_attributes();
+function sml_excerpt_button_current( $block_attributes = null ) {
+
+    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
+    if ( null === $block_attributes ) {
+        $wrapper_attributes = 'class="download-box"';
+    } else {
+        $wrapper_attributes = get_block_wrapper_attributes(['class' => 'download-box']);
+    }
 
     // Get post meta fields' data.
@@ -166 +180 @@
     ?>
 
-    <div class="download-box" <?php echo $wrapper_attributes; ?>>
+    <div <?php echo $wrapper_attributes; ?>>
         <a class="button" href="<?php the_permalink(); ?>"><?php echo $button_text; ?></a>
     </div>
@@ -179 +193 @@
 
 // Returns markup for a search form based on the html5 version of `get_search_form()`, scoped to the sheet music post type.
-function sml_sheet_music_search_form() {
-    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
-    $wrapper_attributes = get_block_wrapper_attributes();
+function sml_sheet_music_search_form( $block_attributes = null ) {
+
+    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
+    if ( null === $block_attributes ) {
+        $wrapper_attributes = '';
+    } else {
+        $wrapper_attributes = get_block_wrapper_attributes();
+    }
 
     ob_start();
@@ -203 +222 @@
 
 // Returns markup for audio and/or video players for the current sheet music post.
-function sml_sheet_music_audio_video_current( $block_attributes = false ) {
-    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
-    $wrapper_attributes = get_block_wrapper_attributes();
+function sml_sheet_music_audio_video_current( $block_attributes = null ) {
+
+    // Block wrapper element attributes if called as a block render callback, or empty string when called in other contexts.
+    if ( null === $block_attributes ) {
+        $wrapper_attributes = 'class="piece-recording"';
+    } else {
+        $wrapper_attributes = get_block_wrapper_attributes(['class' => 'piece-recording']);
+    }
 
     $audio_attachment_id = absint( get_post_meta( get_the_ID(), 'audio-attachment-id', true ) );
@@ -223 +247 @@
     ob_start();
     ?>
-    <div <?php echo $wrapper_attributes; ?> class="piece-recording"><?php
+    <div <?php echo $wrapper_attributes; ?>><?php
         if ( $audio_url ) {
             // Embedded audio player.