diff --git a/app/services/embed_code_service.rb b/app/services/embed_code_service.rb index 69ef3d325..cc243767a 100644 --- a/app/services/embed_code_service.rb +++ b/app/services/embed_code_service.rb @@ -166,8 +166,8 @@ def maybe_add_figcaption(node, file_set_presenter) end def heading_node(heading_tag_for_node, file_set_presenter) - # this whole "auto-heading" deal only applies to Able Player embeds (so, audio or video) - return nil unless file_set_presenter.audio? || file_set_presenter.video? + # this whole "auto-heading" deal only applies to media player embeds (so, audio, video or YouTube videos) + return nil unless file_set_presenter.audio? || file_set_presenter.video? || file_set_presenter.able_player_youtube_video? || file_set_presenter.youtube_player_video? # https://uit.stanford.edu/accessibility/concepts/screen-reader-only-content "<#{heading_tag_for_node} style=\"clip: rect(1px, 1px, 1px, 1px); clip-path: inset(50%); height: 1px; width: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute;\">Media player: #{file_set_presenter.embed_code_title}" end diff --git a/app/views/hyrax/file_sets/media_display_embedded/_video_able_player_youtube.html.erb b/app/views/hyrax/file_sets/media_display_embedded/_video_able_player_youtube.html.erb index 01e6b0d25..65b91f04c 100644 --- a/app/views/hyrax/file_sets/media_display_embedded/_video_able_player_youtube.html.erb +++ b/app/views/hyrax/file_sets/media_display_embedded/_video_able_player_youtube.html.erb @@ -15,6 +15,7 @@ data-able-player data-skin="2020" data-youtube-id="<%=@presenter.youtube_id%>" + data-heading-level="0" <%# see HELIO-4718, HELIO-4802 %> data-allow-fullscreen=<%= params[:fs] == '1' ? "true" : "false" %> data-youtube-nocookie="true" <%# removes "watch later as..." button %> <%= raw file_set.closed_captions.present? ? 'data-transcript-div="video-transcript-container" data-lyrics-mode' : 'data-include-transcript="false"' %>> diff --git a/spec/fixtures/fake_epub_with_embeds.epub b/spec/fixtures/fake_epub_with_embeds.epub index 47cccc672..c3e41d166 100644 Binary files a/spec/fixtures/fake_epub_with_embeds.epub and b/spec/fixtures/fake_epub_with_embeds.epub differ diff --git a/spec/services/embed_code_service_spec.rb b/spec/services/embed_code_service_spec.rb index 0762318cc..49064dc70 100644 --- a/spec/services/embed_code_service_spec.rb +++ b/spec/services/embed_code_service_spec.rb @@ -554,7 +554,8 @@ ordered_members = [cover, epub, image_under_all_headings, audio_top_level, audio_under_h1, audio_under_h2, audio_under_h3, audio_under_h4, audio_under_h5, audio_under_h6, - video_top_level, video_under_h1, video_under_h2, video_under_h3, video_under_h4, video_under_h5, video_under_h6] + video_top_level, video_under_h1, video_under_h2, video_under_h3, video_under_h4, video_under_h5, video_under_h6, + youtube_video] # we'll just test the YouTube video FileSet above as part of this `embeds_heading_testing.xhtml` chapter, embedded under a h2 to receive an automatic h2 monograph.ordered_members = ordered_members monograph.save! ordered_members.each { |item| item.save! } @@ -585,6 +586,7 @@ expect(enhanced_file).to include("

Media player: #{video_top_level.title.first}

") expect(enhanced_file).to include("

Media player: #{video_under_h1.title.first}

") + expect(enhanced_file).to include("

Media player: #{youtube_video.title.first}

") expect(enhanced_file).to include("

Media player: #{video_under_h2.title.first}

") expect(enhanced_file).to include("

Media player: #{video_under_h3.title.first}

") expect(enhanced_file).to include("
Media player: #{video_under_h4.title.first}
")