summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-07-06 08:32:34 -0400
committerGitHub <noreply@github.com>2017-07-06 08:32:34 -0400
commit97cfe62309d7f94a2ea041bc04a7ff25cb1c91fd (patch)
tree6fe7abf03b884b222c91995f6e01207c2159afb7
parentbeac2b0da089941e12e1918d148572b0c9e15ad6 (diff)
downloadchat-97cfe62309d7f94a2ea041bc04a7ff25cb1c91fd.tar.gz
chat-97cfe62309d7f94a2ea041bc04a7ff25cb1c91fd.tar.bz2
chat-97cfe62309d7f94a2ea041bc04a7ff25cb1c91fd.zip
Remove bad checks for emoji picker preview feature (#6861)
-rw-r--r--webapp/components/create_comment.jsx2
-rw-r--r--webapp/components/create_post.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx
index 1ea87663b..d9274c34a 100644
--- a/webapp/components/create_comment.jsx
+++ b/webapp/components/create_comment.jsx
@@ -571,7 +571,7 @@ export default class CreateComment extends React.Component {
);
let emojiPicker = null;
- if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
+ if (window.mm_config.EnableEmojiPicker === 'true') {
emojiPicker = (
<span>
<EmojiPickerOverlay
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx
index c07030543..f2f4d7e39 100644
--- a/webapp/components/create_post.jsx
+++ b/webapp/components/create_post.jsx
@@ -721,7 +721,7 @@ export default class CreatePost extends React.Component {
);
let emojiPicker = null;
- if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
+ if (window.mm_config.EnableEmojiPicker === 'true') {
emojiPicker = (
<span>
<EmojiPickerOverlay