Add doc description, fix uppy options

owncloud · Nov 3, 2022 · 0df3aba · 0df3aba
1 parent 79b242b
commit 0df3aba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -62,6 +62,7 @@ substring of a value of the authenticated user. Examples are `/Shares`, `/{{.Id}
 hovers the row with his mouse. Defaults to `false`.
 - `option.routing` This accepts an object with the following fields to customize the routing behaviour:
   - `options.routing.idBased` Enable or disable fileIds being added to the URL. Defaults to `true` because otherwise e.g. spaces with name clashes can't be resolved correctly. Only disable this if you can guarantee server side that spaces of the same namespace can't have name clashes.   
+- `options.upload.xhr.timeout` Specifies the timeout for XHR uploads in milliseconds.
 
 ### Sentry
 

diff --git a/packages/web-runtime/src/composables/upload/useUpload.ts b/packages/web-runtime/src/composables/upload/useUpload.ts
@@ -104,7 +104,9 @@ export function useUpload(options: UploadOptions): UploadResult {
       ...(isTusSupported && {
         tusMaxChunkSize: unref(tusMaxChunkSize),
         tusHttpMethodOverride: unref(tusHttpMethodOverride),
-        tusExtension: unref(tusExtension),
+        tusExtension: unref(tusExtension)
+      }),
+      ...(!isTusSupported && {
         xhrTimeout: store.getters.configuration?.options?.upload?.xhr?.timeout || 60000
       })
     }