ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change /admin/custom_emoji to honor the auto_play_gif setting (#11801) 

Fixes #9535
rebase/4.0.0rc2
ThibG 2019-09-10 20:56:07 +02:00 committed by Eugen Rochko
parent 2b2b03a7da
commit 17389c63c8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/application_helper.rb
View File

@ -77,8 +77,12 @@ module ApplicationHelper
content_tag(:i, nil, attributes.merge(class: class_names.join(' '))) content_tag(:i, nil, attributes.merge(class: class_names.join(' ')))
end end
def custom_emoji_tag(custom_emoji) def custom_emoji_tag(custom_emoji, animate = true)
image_tag(custom_emoji.image.url, class: 'emojione', alt: ":#{custom_emoji.shortcode}:") if animate
image_tag(custom_emoji.image.url, class: 'emojione', alt: ":#{custom_emoji.shortcode}:")
else
image_tag(custom_emoji.image.url(:static), class: 'emojione custom-emoji', alt: ":#{custom_emoji.shortcode}", 'data-original' => full_asset_url(custom_emoji.image.url), 'data-static' => full_asset_url(custom_emoji.image.url(:static)))
end
end end
def opengraph(property, content) def opengraph(property, content)

2
app/views/admin/custom_emojis/_custom_emoji.html.haml
View File

@ -3,7 +3,7 @@
= f.check_box :custom_emoji_ids, { multiple: true, include_hidden: false }, custom_emoji.id = f.check_box :custom_emoji_ids, { multiple: true, include_hidden: false }, custom_emoji.id
.batch-table__row__content.batch-table__row__content--with-image .batch-table__row__content.batch-table__row__content--with-image
.batch-table__row__content__image .batch-table__row__content__image
= custom_emoji_tag(custom_emoji) = custom_emoji_tag(custom_emoji, animate = current_account&.user&.setting_auto_play_gif)
.batch-table__row__content__text .batch-table__row__content__text
%samp= ":#{custom_emoji.shortcode}:" %samp= ":#{custom_emoji.shortcode}:"