Remove regex from EmbedCard, use Youtube ID

alphagov · Feb 28, 2025 · 127c76c · 127c76c
1 parent b9d6ce1
commit 127c76c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/javascripts/components/embed-card.mjs b/src/javascripts/components/embed-card.mjs
@@ -52,10 +52,7 @@ class EmbedCard extends Component {
 
       const title = placeholderText ? placeholderText.textContent : ''
 
-      const ytHref = placeholder.getAttribute('href')
-      const ytId = ytHref.match(
-        /(youtu\.be\/|youtube\.com\/(watch\?(.*&)?v=|(embed|v)\/))([^?&"'>]+)/
-      )[5]
+      const ytId = this.$root.dataset.ytEmbedId
 
       const divIframeContainer = document.createElement('div')
       divIframeContainer.className = 'app-embed-card__iframe-container'

diff --git a/views/partials/_embed-card.njk b/views/partials/_embed-card.njk
@@ -1,5 +1,5 @@
 {% macro embedCard(params) %}
-  <div class="govuk-grid-row" data-module="app-embed-card">
+  <div class="govuk-grid-row" data-module="app-embed-card" data-yt-id="{{ params.ytId }}">
     <div class="govuk-grid-column-two-thirds-from-desktop">
       {{- caller() if caller else params.content | safe -}}
       <a class="app-embed-card__placeholder app-embed-card__placeholder-thumb-container" href="https://www.youtube.com/watch?v={{ params.ytId }}">