diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-19 14:34:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 14:34:08 +0100 |
| commit | c7f04961b6dcb1b7e12136deadcf65076c130c40 (patch) | |
| tree | 20788cbb86d4ae8d38ce539325205e5f0a1ee344 /app/lib/formatter.rb | |
| parent | ba22398c38067e05f141a0dddeb20bf68913988a (diff) | |
| parent | 3b7b607300d662aa1f25d459ca12aec89ab550e8 (diff) | |
Merge pull request #1513 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/formatter.rb')
| -rw-r--r-- | app/lib/formatter.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 9a3e63d46..02ebe6f89 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'singleton' -require_relative './sanitize_config' class HTMLRenderer < Redcarpet::Render::HTML def block_code(code, language) @@ -223,9 +222,9 @@ class Formatter original_url, static_url = emoji replacement = begin if animate - "<img draggable=\"false\" class=\"emojione\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(original_url)}\" />" + image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:") else - "<img draggable=\"false\" class=\"emojione custom-emoji\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(static_url)}\" data-original=\"#{original_url}\" data-static=\"#{static_url}\" />" + image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url }) end end before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : '' |