jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media assets: fix show page to play Flash files.

Browse Source
This commit is contained in:
evazion
2022-11-27 22:01:08 -06:00
parent b6acc81a17
commit 3a42866a20
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/media_asset_component/media_asset_component.html.erb
View File

@@ -15,7 +15,7 @@
<% elsif is_ugoira? %> <% 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" %> <%= 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? %> <% 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 %> <% end %>
</div> </div>

3
app/javascript/src/javascripts/posts.js
View File

@@ -36,13 +36,14 @@ Post.initialize_all = function() {
this.initialize_post_image_resize_links(); this.initialize_post_image_resize_links();
this.initialize_recommended(); this.initialize_recommended();
this.initialize_ugoira_player(); this.initialize_ugoira_player();
this.initialize_ruffle_player();
} }
if ($("#c-posts #a-show, #c-uploads #a-show").length) { if ($("#c-posts #a-show, #c-uploads #a-show").length) {
this.initialize_edit_dialog(); this.initialize_edit_dialog();
} }
this.initialize_ruffle_player();
$(window).on('danbooru:initialize_saved_seraches', () => { $(window).on('danbooru:initialize_saved_seraches', () => {
Post.initialize_saved_searches(); Post.initialize_saved_searches();
}); });

2
app/views/layouts/default.html.erb
View File

@@ -23,6 +23,8 @@
<%# XXX hack to only load Ruffle on Flash posts %> <%# XXX hack to only load Ruffle on Flash posts %>
<% if controller_name == "posts" && action_name == "show" && @post&.is_flash? %> <% if controller_name == "posts" && action_name == "show" && @post&.is_flash? %>
<%= javascript_pack_tag "application", "alpine", "flash", defer: false %> <%= 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 %> <% else %>
<%= javascript_pack_tag "application", "alpine", defer: false %> <%= javascript_pack_tag "application", "alpine", defer: false %>
<% end %> <% end %>

2
config/initializers/mime_types.rb
View File

@@ -7,3 +7,5 @@ Mime::Type.register_alias "application/xml", :sitemap
# XXX remove after upgrading to rack 3.0.0. # XXX remove after upgrading to rack 3.0.0.
Mime::Type.register "image/webp", :webp Mime::Type.register "image/webp", :webp
Mime::Type.register "image/avif", :avif Mime::Type.register "image/avif", :avif
Mime::Type.register "application/x-shockwave-flash", :swf