Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
e0088a45
Commit
e0088a45
authored
Nov 03, 2020
by
Christoph Scholz
Committed by
JC Brand
Nov 18, 2020
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix emoji-picker for use_system_emojis==false
parent
76aa1ef3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
CHANGES.md
CHANGES.md
+2
-0
src/components/emoji-picker.js
src/components/emoji-picker.js
+1
-1
src/templates/emoji_picker.js
src/templates/emoji_picker.js
+2
-2
No files found.
CHANGES.md
View file @
e0088a45
...
@@ -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:*
...
...
src/components/emoji-picker.js
View file @
e0088a45
...
@@ -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
}
)
});
});
}
}
...
...
src/templates/emoji_picker.js
View file @
e0088a45
...
@@ -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>`
;
}
}
...
...
Thomas Gambier
🚴🏼
@tomo
mentioned in commit
a65da050
·
Jan 28, 2021
mentioned in commit
a65da050
mentioned in commit a65da050947baac60e371b1353d33f3acb849724
Toggle commit list
Thomas Gambier
🚴🏼
@tomo
mentioned in commit
fc1ce2dd
·
Feb 02, 2021
mentioned in commit
fc1ce2dd
mentioned in commit fc1ce2dd310a7f38cdbc75facffd6eac987966e2
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment