diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-06 08:48:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 08:48:34 +0800 |
| commit | 279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c (patch) | |
| tree | e94482d436da3bc8eb0d4021edbf5631cb75322d /webapp/components/rhs_root_post.jsx | |
| parent | 918ce03622c3fb618a13c240e7c4d51edf5a818b (diff) | |
| download | chat-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/rhs_root_post.jsx')
| -rw-r--r-- | webapp/components/rhs_root_post.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index 48512d591..352de0c67 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -219,7 +219,7 @@ export default class RhsRootPost extends React.Component { let react; - if (!isEphemeral && !post.failed && !isSystemMessage && Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) { + if (!isEphemeral && !post.failed && !isSystemMessage && window.mm_config.EnableEmojiPicker === 'true') { react = ( <span> <EmojiPickerOverlay |