diff options
Diffstat (limited to 'webapp/components/create_comment.jsx')
| -rw-r--r-- | webapp/components/create_comment.jsx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx index 1a2bbeeae..1ea87663b 100644 --- a/webapp/components/create_comment.jsx +++ b/webapp/components/create_comment.jsx @@ -76,8 +76,7 @@ export default class CreateComment extends React.Component { ctrlSend: PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter'), showPostDeletedModal: false, enableAddButton, - showEmojiPicker: false, - emojiPickerEnabled: Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW) + showEmojiPicker: false }; this.lastBlurAt = 0; @@ -126,8 +125,7 @@ export default class CreateComment extends React.Component { onPreferenceChange() { this.setState({ - ctrlSend: PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter'), - emojiPickerEnabled: Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW) + ctrlSend: PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter') }); } @@ -609,7 +607,7 @@ export default class CreateComment extends React.Component { value={this.state.message} onBlur={this.handleBlur} createMessage={Utils.localizeMessage('create_comment.addComment', 'Add a comment...')} - emojiEnabled={this.state.emojiPickerEnabled} + emojiEnabled={window.mm_config.EnableEmojiPicker === 'true'} initialText='' channelId={this.props.channelId} id='reply_textbox' |