Changeset 36022

Timestamp:

2022-01-21T13:19:40+13:00 (2 years ago)

Author:

davidb

Message:

Refined show-more for lyrics, where first verse/block is shown

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages/document.xsl (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages/document.xsl

@@ -309 +309 @@
            <b>Lyrics:</b>
          </div>
+         <gsf:div id="lyrics-first-block"/>
          <div id="lyrics-div-show-more">
            <div id="lyrics-div" style="display: none;">
@@ -316 +317 @@
          
          <gsf:script>
+           function pretty_print_lyrics(lyrics) {
+             pp_lyrics = lyrics.replace(/\\\\n/g,"⏎")
+             pp_lyrics = pp_lyrics.replace(/⏎⏎/g,"&lt;hr class=\"verse-divider\"/&gt;")
+             pp_lyrics = pp_lyrics.replace(/⏎/g," ⏎ ")
+
+         return pp_lyrics
+         }
+         
            $( document ).ready(function() {
              var lyrics = $('#lyrics').html();
              lyrics = lyrics.replace(/\\\\n\\n/g,"⏎⏎")
-             lyrics = lyrics.replace(/\\\\n/g,"⏎")
-             lyrics = lyrics.replace(/⏎⏎/g,"&lt;hr class=\"verse-divider\"/&gt;")
-             lyrics = lyrics.replace(/⏎/g," ⏎ ")
-         
-             $("#lyrics").html(lyrics)
+
+         var first_block_pos = lyrics.indexOf("⏎⏎")
+         if (first_block_pos != -1) {
+           var lyrics_first_block = lyrics.substring(0,first_block_pos)
+           var lyrics_remaining   = lyrics.substring(first_block_pos)
+         }
+         else {
+           var lyrics_first_block = ""
+           var lyrics_remaining   = lyrics
+         }
+
+             lyrics_first_block = pretty_print_lyrics(lyrics_first_block)
+             lyrics_remaining = pretty_print_lyrics(lyrics_remaining)
+         
+             $("#lyrics-first-block").html(lyrics_first_block)
+             $("#lyrics").html(lyrics_remaining)
+         
              $("#lyrics-div").show()