Commit e0088a45 authored by Christoph Scholz's avatar Christoph Scholz Committed by JC Brand

fix emoji-picker for use_system_emojis==false

parent 76aa1ef3
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
## 7.0.1 (Unreleased) ## 7.0.1 (Unreleased)
- #2328: Honor `use_system_emojis` in emoji-picker
## 7.0.0 (2020-11-18) ## 7.0.0 (2020-11-18)
*Note for plugin authors:* *Note for plugin authors:*
......
...@@ -61,7 +61,7 @@ export default class EmojiPicker extends CustomElement { ...@@ -61,7 +61,7 @@ export default class EmojiPicker extends CustomElement {
'query': this.query, 'query': this.query,
'search_results': this.search_results, 'search_results': this.search_results,
'render_emojis': this.render_emojis, 'render_emojis': this.render_emojis,
'sn2Emoji': shortname => u.shortnamesToEmojis(this.getTonedShortname(shortname)) 'sn2Emoji': shortname => u.shortnamesToEmojis(this.getTonedShortname(shortname), {'add_title_wrapper': true})
}); });
} }
......
...@@ -28,7 +28,7 @@ const emoji_picker_header = (o) => { ...@@ -28,7 +28,7 @@ const emoji_picker_header = (o) => {
const emoji_item = (o) => { const emoji_item = (o) => {
return html` return html`
<li class="emoji insert-emoji ${o.shouldBeHidden(o.emoji.sn) ? 'hidden' : ''}" data-emoji="${o.emoji.sn}" title="${o.emoji.sn}"> <li class="emoji insert-emoji ${o.shouldBeHidden(o.emoji.sn) ? 'hidden' : ''}" data-emoji="${o.emoji.sn}" title="${o.emoji.sn}">
<a href="#" @click=${o.insertEmoji} data-emoji="${o.emoji.sn}">${u.shortnamesToEmojis(o.emoji.sn)}</a> <a href="#" @click=${o.insertEmoji} data-emoji="${o.emoji.sn}">${u.shortnamesToEmojis(o.emoji.sn, {'add_title_wrapper': true})}</a>
</li> </li>
`; `;
} }
...@@ -65,7 +65,7 @@ export const tpl_all_emojis = (o) => { ...@@ -65,7 +65,7 @@ export const tpl_all_emojis = (o) => {
const skintone_emoji = (o) => { const skintone_emoji = (o) => {
return html` return html`
<li data-skintone="${o.skintone}" class="emoji-skintone ${(o.current_skintone === o.skintone) ? 'picked' : ''}"> <li data-skintone="${o.skintone}" class="emoji-skintone ${(o.current_skintone === o.skintone) ? 'picked' : ''}">
<a class="pick-skintone" href="#" data-skintone="${o.skintone}" @click=${o.onSkintonePicked}>${u.shortnamesToEmojis(':'+o.skintone+':')}</a> <a class="pick-skintone" href="#" data-skintone="${o.skintone}" @click=${o.onSkintonePicked}>${u.shortnamesToEmojis(':'+o.skintone+':', {'add_title_wrapper': true})}</a>
</li>`; </li>`;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment