diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 12:25:55 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 12:25:55 -0400 |
commit | 6ae34644840f9a99769ec5b3fc44b98690a215fc (patch) | |
tree | 9f67d49bc78209d4d72afdeaf1556933850d84ea /webapp/components/file_upload.jsx | |
parent | e2a8b3d47e76d30c43af2f4481e2c72eb6ca0e09 (diff) | |
download | chat-6ae34644840f9a99769ec5b3fc44b98690a215fc.tar.gz chat-6ae34644840f9a99769ec5b3fc44b98690a215fc.tar.bz2 chat-6ae34644840f9a99769ec5b3fc44b98690a215fc.zip |
Fixed pasting images not working (#5971)
Diffstat (limited to 'webapp/components/file_upload.jsx')
-rw-r--r-- | webapp/components/file_upload.jsx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index 297095e0a..d97b1ed3b 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -211,20 +211,20 @@ class FileUpload extends React.Component { // jquery-dragster doesn't provide a function to unregister itself so do it manually target.off('dragenter dragleave dragover drop dragster:enter dragster:leave dragster:over dragster:drop'); } + emojiClick() { this.props.onEmojiClick(); } + pasteUpload(e) { - var inputDiv = ReactDOM.findDOMNode(this.refs.input); const {formatMessage} = this.props.intl; if (!e.clipboardData || !e.clipboardData.items) { return; } - var textarea = $(inputDiv.parentNode.parentNode).find('.custom-textarea')[0]; - - if (textarea !== e.target && !$.contains(textarea, e.target)) { + const textarea = ReactDOM.findDOMNode(this.props.getTarget()); + if (!textarea || !textarea.contains(e.target)) { return; } @@ -386,6 +386,7 @@ FileUpload.propTypes = { intl: intlShape.isRequired, onUploadError: React.PropTypes.func, getFileCount: React.PropTypes.func, + getTarget: React.PropTypes.func.isRequired, onClick: React.PropTypes.func, onFileUpload: React.PropTypes.func, onUploadStart: React.PropTypes.func, |