github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 01:29:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: prevents custom emoji to show double colons and set background img (#9471)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-04-19 18:54:10 +02:00 committed by GitHub
parent 3e3ac704e1
commit cfe510cbcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/emoji-picker.js
View File

@ -434,7 +434,7 @@ export default Component.extend({
this.$visibleSections.forEach(visibleSection => { this.$visibleSections.forEach(visibleSection => {
const $unloadedEmojis = $(visibleSection).find( const $unloadedEmojis = $(visibleSection).find(
"button.emoji[data-loaded!='1']" "button.emoji:not(.custom)[data-loaded!='1']"
); );
$.each($unloadedEmojis, (_, button) => { $.each($unloadedEmojis, (_, button) => {
let offsetTop = button.offsetTop; let offsetTop = button.offsetTop;

2
app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
View File

@ -61,7 +61,7 @@
{{#if emojis.length}} {{#if emojis.length}}
<div class='section-group'> <div class='section-group'>
{{#each emojis as |emoji|}} {{#each emojis as |emoji|}}
<button type="button" class="emoji" tabindex="-1" title=":{{emoji.code}}:"> <button type="button" class="custom emoji" tabindex="-1" title="{{emoji.code}}">
<img loading="lazy" class="emoji" src="{{emoji.src}}"> <img loading="lazy" class="emoji" src="{{emoji.src}}">
</button> </button>
{{/each}} {{/each}}