summaryrefslogtreecommitdiffstats
path: root/webapp/components/post_view
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-07-06 08:48:34 +0800
committerGitHub <noreply@github.com>2017-07-06 08:48:34 +0800
commit279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c (patch)
treee94482d436da3bc8eb0d4021edbf5631cb75322d /webapp/components/post_view
parent918ce03622c3fb618a13c240e7c4d51edf5a818b (diff)
downloadchat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.gz
chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.bz2
chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.zip
[PLT-6969] System console setting for the emoji picker (#6809)
* system console setting for the emoji picker * remove state.emojiPickerEnable * update url to /admin_console/customization/emoji
Diffstat (limited to 'webapp/components/post_view')
-rw-r--r--webapp/components/post_view/post_info/post_info.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/post_view/post_info/post_info.jsx b/webapp/components/post_view/post_info/post_info.jsx
index f2c2423f6..d64d1aca6 100644
--- a/webapp/components/post_view/post_info/post_info.jsx
+++ b/webapp/components/post_view/post_info/post_info.jsx
@@ -151,7 +151,7 @@ export default class PostInfo extends React.PureComponent {
/>
);
- if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
+ if (window.mm_config.EnableEmojiPicker === 'true') {
react = (
<span>
<EmojiPickerOverlay