diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-06 04:21:04 +0800 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-07-05 16:21:04 -0400 |
commit | 81a893b556bbd4e5a73dd41b3dad92915cb06119 (patch) | |
tree | f455a019b374d619be4d88e4ddb1398d9864689d /webapp/components/file_upload.jsx | |
parent | 4efb0f37b701aa8e875e541cc4f121c264e4d8ab (diff) | |
download | chat-81a893b556bbd4e5a73dd41b3dad92915cb06119.tar.gz chat-81a893b556bbd4e5a73dd41b3dad92915cb06119.tar.bz2 chat-81a893b556bbd4e5a73dd41b3dad92915cb06119.zip |
fix position of emoji picker (#6837)
Diffstat (limited to 'webapp/components/file_upload.jsx')
-rw-r--r-- | webapp/components/file_upload.jsx | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index 17bb50a2b..0b32ab66e 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -51,7 +51,6 @@ class FileUpload extends React.Component { this.pasteUpload = this.pasteUpload.bind(this); this.keyUpload = this.keyUpload.bind(this); this.handleMaxUploadReached = this.handleMaxUploadReached.bind(this); - this.emojiClick = this.emojiClick.bind(this); this.state = { requests: {} @@ -230,10 +229,6 @@ class FileUpload extends React.Component { target.off('dragenter dragleave dragover drop dragster:enter dragster:leave dragster:over dragster:drop'); } - emojiClick() { - this.props.onEmojiClick(); - } - pasteUpload(e) { const {formatMessage} = this.props.intl; @@ -377,19 +372,8 @@ class FileUpload extends React.Component { } const channelId = this.props.channelId || ChannelStore.getCurrentId(); - const uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId); - let emojiSpan; - if (this.props.emojiEnabled) { - emojiSpan = ( - <span - className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName} - onClick={this.emojiClick} - /> - ); - } - let fileDiv; if (global.window.mm_config.EnableFileAttachments === 'true') { fileDiv = ( @@ -413,10 +397,9 @@ class FileUpload extends React.Component { return ( <span ref='input' - className={'btn btn-file' + (uploadsRemaining <= 0 ? ' btn-file__disabled' : '')} + className={uploadsRemaining <= 0 ? ' btn-file__disabled' : ''} > {fileDiv} - {emojiSpan} </span> ); } @@ -433,10 +416,7 @@ FileUpload.propTypes = { onFileUploadChange: PropTypes.func, onTextDrop: PropTypes.func, channelId: PropTypes.string, - postType: PropTypes.string, - onEmojiClick: PropTypes.func, - navBarName: PropTypes.string, - emojiEnabled: PropTypes.bool + postType: PropTypes.string }; export default injectIntl(FileUpload, {withRef: true}); |