diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-08-11 23:15:32 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2020-08-12 00:00:42 +0200 |
| commit | 7c20530fb70439710ac1e0c8ad8544409506c93a (patch) | |
| tree | bdcb6e1e4be2b22bfa80e558f491e31791fe7107 /app | |
| parent | 0376b6b92bb80394341ae648d646a508484aa154 (diff) | |
Fix embedded player
(broken because I forgot to adapt it to glitch-soc's theming system)
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/media_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/media/player.html.haml | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index ce015dd1b..772fc42cb 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -11,6 +11,7 @@ class MediaController < ApplicationController before_action :verify_permitted_status! before_action :check_playable, only: :player before_action :allow_iframing, only: :player + before_action :set_pack, only: :player content_security_policy only: :player do |p| p.frame_ancestors(false) @@ -43,4 +44,8 @@ class MediaController < ApplicationController def allow_iframing response.headers['X-Frame-Options'] = 'ALLOWALL' end + + def set_pack + use_pack 'public' + end end diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml index ae47750e9..bd5610a0b 100644 --- a/app/views/media/player.html.haml +++ b/app/views/media/player.html.haml @@ -1,6 +1,13 @@ - content_for :header_tags do = render_initial_state - = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' + - if @theme + - if @theme[:supported_locales].include? I18n.locale.to_s + = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous' + - elsif @theme[:supported_locales].include? 'en' + = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' + = render partial: 'layouts/theme', object: @core + = render partial: 'layouts/theme', object: @theme - if @media_attachment.video? = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description do |