summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-02-28 18:51:11 -0500
committerenahum <nahumhbl@gmail.com>2017-02-28 20:51:11 -0300
commitdf07aeeb126954ed14e393a3a09d28c4bbf630fb (patch)
tree49e092821480e645847db16dc0357ecba21e17fc
parent23be0167f478765eb67ba21ab8837b0cbff8705a (diff)
downloadchat-df07aeeb126954ed14e393a3a09d28c4bbf630fb.tar.gz
chat-df07aeeb126954ed14e393a3a09d28c4bbf630fb.tar.bz2
chat-df07aeeb126954ed14e393a3a09d28c4bbf630fb.zip
Fixed pasting text sending the caret to the end of the post textbox (#5567)
-rw-r--r--webapp/components/file_upload.jsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx
index 5710f2365..e1535c0bb 100644
--- a/webapp/components/file_upload.jsx
+++ b/webapp/components/file_upload.jsx
@@ -292,9 +292,11 @@ class FileUpload extends React.Component {
this.props.onUploadStart([clientId], channelId);
}
- }
- this.props.onFileUploadChange();
+ if (numToUpload > 0) {
+ this.props.onFileUploadChange();
+ }
+ }
}
keyUpload(e) {