Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
mattermost-webapp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
sysadmin
mattermost
mattermost-webapp
Commits
7742a53a
Commit
7742a53a
authored
Dec 07, 2018
by
Saturnino Abril
Committed by
Harrison Healey
Dec 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix text rendering of non-existent emoji when post metadata is enabled (#2143)
parent
1607926c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
components/post_emoji/index.jsx
components/post_emoji/index.jsx
+3
-1
No files found.
components/post_emoji/index.jsx
View file @
7742a53a
...
...
@@ -12,6 +12,7 @@ import {getEmojiMap} from 'selectors/emojis';
import
PostEmoji
from
'
./post_emoji.jsx
'
;
function
mapStateToProps
(
state
,
ownProps
)
{
const
config
=
getConfig
(
state
);
const
emojiMap
=
getEmojiMap
(
state
);
const
emoji
=
emojiMap
.
get
(
ownProps
.
name
);
...
...
@@ -21,7 +22,8 @@ function mapStateToProps(state, ownProps) {
imageUrl
=
getEmojiImageUrl
(
emoji
);
}
else
{
displayTextOnly
=
state
.
entities
.
emojis
.
nonExistentEmoji
.
has
(
ownProps
.
name
)
||
getConfig
(
state
).
EnableCustomEmoji
!==
'
true
'
||
config
.
EnableCustomEmoji
!==
'
true
'
||
config
.
ExperimentalEnablePostMetadata
===
'
true
'
||
getCurrentUserId
(
state
)
===
''
;
}
...
...
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