From 279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 6 Jul 2017 08:48:34 +0800 Subject: [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 --- webapp/components/create_comment.jsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'webapp/components/create_comment.jsx') 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' -- cgit v1.2.3-1-g7c22