zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Make not modify normal emoji's behavior

This commit is contained in:
nullkal 2017-10-20 04:32:49 +09:00
parent 4d0898f6a2
commit 6a5bdf0c11
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/emoji/emoji.js
View File

@ -28,7 +28,7 @@ const emojify = (str, customEmojis = {}) => {
// if you want additional emoji handler, add statements below which set replacement and return true. // if you want additional emoji handler, add statements below which set replacement and return true.
if (shortname in customEmojis) { if (shortname in customEmojis) {
const filename = allowAnimations ? customEmojis[shortname].url : customEmojis[shortname].static_url; const filename = allowAnimations ? customEmojis[shortname].url : customEmojis[shortname].static_url;
replacement = `<img draggable="false" class="emojione" alt="${shortname}" title="${shortname}" src="${filename}" />`; replacement = `<img draggable="false" class="emojione custom-emoji" alt="${shortname}" title="${shortname}" src="${filename}" />`;
return true; return true;
} }
return false; return false;

10
app/javascript/styles/mastodon/components.scss
View File

@ -521,6 +521,11 @@
} }
.emojione { .emojione {
width: 18px;
height: 18px;
}
.custom-emoji {
width: 20px; width: 20px;
height: 20px; height: 20px;
margin: -5px 0 0; margin: -5px 0 0;
@ -784,6 +789,11 @@
line-height: 24px; line-height: 24px;
.emojione { .emojione {
width: 22px;
height: 22px;
}
.custom-emoji {
width: 24px; width: 24px;
height: 24px; height: 24px;
margin: -5px 0 0; margin: -5px 0 0;

2
app/lib/formatter.rb
View File

@ -107,7 +107,7 @@ class Formatter
emoji = emoji_map[shortcode] emoji = emoji_map[shortcode]
if emoji if emoji
replacement = "<img draggable=\"false\" class=\"emojione\" alt=\":#{shortcode}:\" title=\":#{shortcode}:\" src=\"#{emoji}\" />" replacement = "<img draggable=\"false\" class=\"emojione custom-emoji\" alt=\":#{shortcode}:\" title=\":#{shortcode}:\" src=\"#{emoji}\" />"
before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : '' before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : ''
html = before_html + replacement + html[i + 1..-1] html = before_html + replacement + html[i + 1..-1]
i += replacement.size - (shortcode.size + 2) - 1 i += replacement.size - (shortcode.size + 2) - 1