diff --git a/app/components/media_asset_component/media_asset_component.html.erb b/app/components/media_asset_component/media_asset_component.html.erb index 92669b706..fae5aeadc 100644 --- a/app/components/media_asset_component/media_asset_component.html.erb +++ b/app/components/media_asset_component/media_asset_component.html.erb @@ -15,7 +15,7 @@ <% elsif is_ugoira? %> <%= tag.video src: variant(:sample).file_url, width: image_width, height: image_height, autoplay: true, loop: true, controls: "controls", class: "media-asset-image max-h-inherit max-w-full h-full w-auto select-none" %> <% elsif is_flash? %> - <%= tag.div class: "ruffle-container", "data-swf": variant(:original).file_url %> + <%= tag.div "data-swf": variant(:original).file_url, class: "media-asset-image ruffle-container max-h-inherit max-w-full h-full w-auto select-none" %> <% end %> diff --git a/app/javascript/src/javascripts/posts.js b/app/javascript/src/javascripts/posts.js index 8cf25f613..f833831ae 100644 --- a/app/javascript/src/javascripts/posts.js +++ b/app/javascript/src/javascripts/posts.js @@ -36,13 +36,14 @@ Post.initialize_all = function() { this.initialize_post_image_resize_links(); this.initialize_recommended(); this.initialize_ugoira_player(); - this.initialize_ruffle_player(); } if ($("#c-posts #a-show, #c-uploads #a-show").length) { this.initialize_edit_dialog(); } + this.initialize_ruffle_player(); + $(window).on('danbooru:initialize_saved_seraches', () => { Post.initialize_saved_searches(); }); diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index db4ce6d6f..bb66c01c9 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -23,6 +23,8 @@ <%# XXX hack to only load Ruffle on Flash posts %> <% if controller_name == "posts" && action_name == "show" && @post&.is_flash? %> <%= javascript_pack_tag "application", "alpine", "flash", defer: false %> + <% elsif controller_name == "media_assets" && action_name == "show" && @media_asset&.is_flash? %> + <%= javascript_pack_tag "application", "alpine", "flash", defer: false %> <% else %> <%= javascript_pack_tag "application", "alpine", defer: false %> <% end %> diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 285c9e43b..0d9dd405d 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -7,3 +7,5 @@ Mime::Type.register_alias "application/xml", :sitemap # XXX remove after upgrading to rack 3.0.0. Mime::Type.register "image/webp", :webp Mime::Type.register "image/avif", :avif + +Mime::Type.register "application/x-shockwave-flash", :swf