consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3496 from LextrendIT/feature/refactor_embedded_video

Browse Source 
Refactor embed video helper to disconnect from @proposal
This commit is contained in:
Javier Martín
2019-09-14 00:02:41 +02:00
committed by GitHub
parent 61b28224ae 71f750ca9d
commit 3c49ae3386
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/embed_videos_helper.rb
View File

@@ -3,9 +3,9 @@ module EmbedVideosHelper
VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
def embedded_video_code
link = @proposal.video_url
title = t("proposals.show.embed_video_title", proposal: @proposal.title)
def embedded_video_code(resource)
link = resource.video_url
title = t("proposals.show.embed_video_title", proposal: resource.title)
if link =~ /vimeo.*/
server = "Vimeo"
elsif link =~ /youtu*.*/

2
app/views/legislation/proposals/show.html.erb
View File

@@ -63,7 +63,7 @@
<% if @proposal.video_url.present? %>
<div class="small-12 medium-7 small-centered">
<div class="flex-video">
<div id="js-embedded-video" data-video-code="<%= embedded_video_code %>"></div>
<div id="js-embedded-video" data-video-code="<%= embedded_video_code(@proposal) %>"></div>
</div>
</div>
<% end %>

2
app/views/proposals/_info.html.erb
View File

@@ -34,7 +34,7 @@
<% if @proposal.video_url.present? %>
<div class="small-12 medium-7 small-centered">
<div class="flex-video">
<div id="js-embedded-video" data-video-code="<%= embedded_video_code %>"></div>
<div id="js-embedded-video" data-video-code="<%= embedded_video_code(@proposal) %>"></div>
</div>
</div>
<% end %>