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

ruffle: fix issue with ruffle falsely triggering keyboard shortcuts.

Browse Source 
Fix issue mentioned in 55980c6fb with Javascript spazzing out on Flash
posts and randomly triggering keyboard shortcuts.

The bug was calling `javascript_pack_tag` twice. This caused the
runtime Javascript chunk to be loaded twice, caused a lot of Javascript
errors that somehow resulted in keyboard shortcuts being triggered.

The fix is to combine both calls into `javascript_pack_tag "application", "flash"`.

hxxps://github.com.rails.webpacker.issues.2932
This commit is contained in:
evazion
2021-03-31 22:10:04 -05:00
parent 946b4cc960
commit fff68e1d16
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,14 @@
<% if CurrentUser.user.blacklisted_tags.present? %>
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags.gsub(/(?:\r|\n)+/, ",") %>">
<% end %>
<%= javascript_pack_tag "application" %>
<%# XXX hack to only load Ruffle on Flash posts %>
<% if controller_name == "posts" && action_name == "show" && @post.is_flash? %>
<%= javascript_pack_tag "application", "flash" %>
<% else %>
<%= javascript_pack_tag "application" %>
<% end %>
<%= stylesheet_pack_tag "application" %>
<% if CurrentUser.user.custom_style.present? && params.fetch(:css, "true").truthy? %>
<%= stylesheet_link_tag custom_style_users_path(md5: Digest::MD5.hexdigest(CurrentUser.user.custom_style)), media: "screen" %>