Merge pull request #3607 from tylershuster/firefox-image-paste

landscape: delay uploading briefly to account for browser inconsistencies
This commit is contained in:
matildepark 2020-09-29 16:13:53 -04:00 committed by GitHub
commit 68047b073c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions

View File

@ -162,12 +162,9 @@ export default class ChatInput extends Component<ChatInputProps, ChatInputState>
}
if (!this.s3Uploader.current || !this.s3Uploader.current.inputRef.current) return;
this.s3Uploader.current.inputRef.current.files = files;
setTimeout(() => {
if (this.s3Uploader.current.state.isUploading) return;
const fire = document.createEvent("HTMLEvents");
fire.initEvent("change", true, true);
this.s3Uploader.current?.inputRef.current?.dispatchEvent(fire);
}, 200);
}
render() {

View File

@ -99,8 +99,9 @@ export class S3Upload extends Component<S3UploadProps, S3UploadState> {
const timestamp = deSig(dateToDa(new Date()));
let bucket = props.configuration.currentBucket;
setTimeout(() => {
if (this.state.isUploading) return;
this.setState({ isUploading: true });
this.s3.upload(bucket, `${window.ship}/${timestamp}-${fileName}.${fileExtension}`, file)
.then((data) => {
if (!data || !('Location' in data)) {
@ -115,6 +116,8 @@ export class S3Upload extends Component<S3UploadProps, S3UploadState> {
.finally(() => {
this.setState({ isUploading: false });
});
}, 200);
}
onClick() {