ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity

Merge branch 'AD-425-took-45-min-to-upload-an-11-s-vid' into AD-914-fix-sentry-logging

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-09-04 17:16:54 +02:00
commit ec1def31fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/components/ascribe_uploader/react_s3_fine_uploader.js
View File

@ -20,7 +20,6 @@ import AppConstants from '../../constants/application_constants';
import { computeHashOfFile } from '../../utils/file_utils'; import { computeHashOfFile } from '../../utils/file_utils';
var ReactS3FineUploader = React.createClass({ var ReactS3FineUploader = React.createClass({
propTypes: { propTypes: {
keyRoutine: React.PropTypes.shape({ keyRoutine: React.PropTypes.shape({
url: React.PropTypes.string, url: React.PropTypes.string,
@ -353,10 +352,11 @@ var ReactS3FineUploader = React.createClass({
}, },
onComplete(id, name, res, xhr) { onComplete(id, name, res, xhr) {
console.log(xhr);
// there has been an issue with the server's connection // there has been an issue with the server's connection
if(xhr.status === 0) { if((xhr && xhr.status === 0) || res.error) {
console.log('asdasdas');
console.logGlobal(new Error('Complete was called but there wasn\t a success'), false, { console.logGlobal(new Error(res.error || 'Complete was called but there wasn\t a success'), false, {
files: this.state.filesToUpload, files: this.state.filesToUpload,
chunks: this.state.chunks chunks: this.state.chunks
}); });