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/create_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/create_post.jsx')
| -rw-r--r-- | webapp/components/create_post.jsx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 4a2cf5302..c07030543 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -96,7 +96,6 @@ export default class CreatePost extends React.Component { showPostDeletedModal: false, enableSendButton: false, showEmojiPicker: false, - emojiPickerEnabled: Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW), showConfirmModal: false, totalMembers: members }; @@ -488,8 +487,7 @@ export default class CreatePost extends React.Component { this.setState({ showTutorialTip: tutorialStep === TutorialSteps.POST_POPOVER, ctrlSend: PreferenceStore.getBool(Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter'), - fullWidthTextBox: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.CHANNEL_DISPLAY_MODE, Preferences.CHANNEL_DISPLAY_MODE_DEFAULT) === Preferences.CHANNEL_DISPLAY_MODE_FULL_SCREEN, - emojiPickerEnabled: Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW) + fullWidthTextBox: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.CHANNEL_DISPLAY_MODE, Preferences.CHANNEL_DISPLAY_MODE_DEFAULT) === Preferences.CHANNEL_DISPLAY_MODE_FULL_SCREEN }); } @@ -761,7 +759,7 @@ export default class CreatePost extends React.Component { handlePostError={this.handlePostError} value={this.state.message} onBlur={this.handleBlur} - emojiEnabled={this.state.emojiPickerEnabled} + emojiEnabled={window.mm_config.EnableEmojiPicker === 'true'} createMessage={Utils.localizeMessage('create_post.write', 'Write a message...')} channelId={this.state.channelId} id='post_textbox' |