Skip to content

Commit 8477fe6

Browse files
authored
Merge pull request transloadit#7 from LexPredict/dev
tus
2 parents 6d415e1 + dfdad30 commit 8477fe6

File tree

2 files changed

+31
-10
lines changed

2 files changed

+31
-10
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "uppy-build",
3-
"version": "1.0.0.1",
3+
"version": "1.0.0.2",
44
"description": "Extensible JavaScript file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Instagram, Dropbox, Google Drive, S3 and more :dog:",
55
"lint-staged": {
66
"*.js": "eslint",

packages/@uppy/tus/src/index.js

+30-9
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,39 @@ module.exports = class Tus extends Plugin {
199199

200200
const { message } = err;
201201
if (message.includes("status")) {
202-
const fileStatus = JSON.parse(message.substring(message.indexOf('{'), message.lastIndexOf('}') + 1));
203-
console.log(fileStatus);
204-
205-
file[fileStatus.status] = true
206-
207-
this.uppy.emit('upload-success', file, uploadResp)
202+
const status_message = JSON.parse(message.substring(message.indexOf('{'), message.lastIndexOf('}') + 1));
203+
console.log(status);
204+
205+
file[status_message.status] = true
206+
207+
if (status_message.status == "delete_pending") {
208+
this.uppy.setState({ pause: true })
209+
this.uppy.emit("upload-pending", file, uploadResp);
210+
}
211+
else {
212+
this.uppy.emit('upload-success', file, uploadResp)
213+
}
208214
}
209215
else {
210-
status = "exist";
211-
file[status] = true
212216

213-
this.uppy.emit('upload-success', file, uploadResp)
217+
file.delete_pending = true
218+
219+
// this.uppy.log(err)
220+
// console.log("HERE here2", file, err.message);
221+
// this.uppy.emit('upload-error', file, err)
222+
// err.message = `Failed because: ${err.message}`
223+
224+
// this.resetUploaderReferences(file.id)
225+
// queuedRequest.done()
226+
// reject(err)
227+
this.uppy.setState({ pause: true })
228+
this.uppy.emit("upload-pending", file, uploadResp);
229+
230+
console.log("FILE", file);
231+
// status = "exist";
232+
// file[status] = true
233+
234+
// this.uppy.emit('upload-success', file, uploadResp)
214235
}
215236

216237
if (upload.url) {

0 commit comments

Comments
 (0)