ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 17:41:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/interface/src/views/apps/chat/components/lib/ChatInput.tsx
View File

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

33
pkg/interface/src/views/components/s3-upload.tsx
View File

@ -99,22 +99,25 @@ export class S3Upload extends Component<S3UploadProps, S3UploadState> {
const timestamp = deSig(dateToDa(new Date())); const timestamp = deSig(dateToDa(new Date()));
let bucket = props.configuration.currentBucket; let bucket = props.configuration.currentBucket;
this.setState({ isUploading: true }); 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)) {
return;
}
this.props.uploadSuccess(data.Location);
})
.catch((err) => {
console.error(err);
this.props.uploadError(err);
})
.finally(() => {
this.setState({ isUploading: false });
});
}, 200);
this.s3.upload(bucket, `${window.ship}/${timestamp}-${fileName}.${fileExtension}`, file)
.then((data) => {
if (!data || !('Location' in data)) {
return;
}
this.props.uploadSuccess(data.Location);
})
.catch((err) => {
console.error(err);
this.props.uploadError(err);
})
.finally(() => {
this.setState({ isUploading: false });
});
} }
onClick() { onClick() {