summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2016-02-17 14:32:25 -0500
committerJoramWilander <jwawilander@gmail.com>2016-02-17 14:32:25 -0500
commitccf897c7ee8cd9eec1a5042f5cfd776d8c1cf5ee (patch)
treef830eb61847fd579c6f5bed48faf3396a558e35b /web/react
parent65c036d23a4cc4795ccb303dd44f8251ed6d4b03 (diff)
downloadchat-ccf897c7ee8cd9eec1a5042f5cfd776d8c1cf5ee.tar.gz
chat-ccf897c7ee8cd9eec1a5042f5cfd776d8c1cf5ee.tar.bz2
chat-ccf897c7ee8cd9eec1a5042f5cfd776d8c1cf5ee.zip
Fix loc error with cancelling in progress uploads
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/create_comment.jsx2
-rw-r--r--web/react/components/create_post.jsx2
-rw-r--r--web/react/components/file_upload.jsx3
3 files changed, 4 insertions, 3 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 55dd8276c..5105cf23a 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -285,7 +285,7 @@ class CreateComment extends React.Component {
if (index !== -1) {
uploadsInProgress.splice(index, 1);
- this.refs.fileUpload.cancelUpload(id);
+ this.refs.fileUpload.getWrappedInstance().cancelUpload(id);
}
} else {
previews.splice(index, 1);
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index b9fbf09b5..a4e60191d 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -286,7 +286,7 @@ class CreatePost extends React.Component {
if (index !== -1) {
uploadsInProgress.splice(index, 1);
- this.refs.fileUpload.cancelUpload(id);
+ this.refs.fileUpload.getWrappedInstance().cancelUpload(id);
}
} else {
previews.splice(index, 1);
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index f5c32c825..0454fe510 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -34,6 +34,7 @@ class FileUpload extends React.Component {
this.uploadFiles = this.uploadFiles.bind(this);
this.handleChange = this.handleChange.bind(this);
this.handleDrop = this.handleDrop.bind(this);
+ this.cancelUpload = this.cancelUpload.bind(this);
this.state = {
requests: {}
@@ -331,4 +332,4 @@ FileUpload.propTypes = {
postType: React.PropTypes.string
};
-export default injectIntl(FileUpload);
+export default injectIntl(FileUpload, {withRef: true});