Skip to content
This repository was archived by the owner on Jul 26, 2024. It is now read-only.
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions widgets/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ def onUploadUrlAvailable(self, req):
Internal callback - the actual upload url (retrieved by calling /file/getUploadURL) is known.
"""
if conf["core.version"][0] == 3:

params = NetworkService.decode(req)["values"]

formData = html5.jseval("new FormData();")
Expand All @@ -197,11 +196,7 @@ def onUploadUrlAvailable(self, req):
formData.append(key, value)
formData.append("file", req.file)

self.xhr = html5.jseval("new XMLHttpRequest()")
self.xhr.open("POST", params["url"])
self.xhr.onload = self.onLoad
self.xhr.upload.onprogress = self.onProgress
self.xhr.send(formData)
html5.window.fetch(params["url"], {"method": "POST", "body": formData, "mode": "no-cors"}).then(self.onLoad)

else:
r = NetworkService.request("", "/vi/skey", successHandler=self.onSkeyAvailable)
Expand Down Expand Up @@ -237,20 +232,17 @@ def onLoad(self, *args, **kwargs):
Internal callback - The state of our upload changed.
"""
if conf["core.version"][0] == 3:
if self.xhr.status in [200, 204]:
NetworkService.request(
"file", "add", {
"key": self.targetKey,
"node": self.node,
"skelType": "leaf"
},
successHandler=self.onUploadAdded,
secure=True
NetworkService.request(
"file", "add", {
"key": self.targetKey,
"node": self.node,
"skelType": "leaf"
},
successHandler=self.onUploadAdded,
failureHandler=self.onFailed,
secure=True
)
else:
DeferredCall(self.onFailed, self.xhr.status, _delay=1000)
else:

if self.xhr.status == 200:
self.responseValue = json.loads(self.xhr.responseText)
DeferredCall(self.onSuccess, _delay=1000)
Expand Down