diff options
| author | Simon L <szaimen@e.mail.de> | 2022-11-18 20:56:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-18 20:56:19 +0100 |
| commit | d84d75dc3a489861b8a6463fd60396326c6ae633 (patch) | |
| tree | 4793fa88964fb3e03ed51f870e5e89ab03a0dca6 /apps | |
| parent | f03b33d3b194f902585de7fa4b06374656c2d666 (diff) | |
| parent | 259af058b0041d62d1df51d820d94809646cc775 (diff) | |
| download | nextcloud-server-d84d75dc3a489861b8a6463fd60396326c6ae633.tar.gz nextcloud-server-d84d75dc3a489861b8a6463fd60396326c6ae633.zip | |
Merge pull request #35265 from nextcloud/backport/35259/stable25
[stable25] Also cancel XHR when cancelling uploads
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 69f9d9d0e63..a0b46e1d03b 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -76,6 +76,11 @@ OC.FileUpload.prototype = { id: null, /** + * Upload data structure + */ + data: null, + + /** * Upload element * * @type Object @@ -337,6 +342,10 @@ OC.FileUpload.prototype = { return } this.aborted = true; + if (this.data) { + // abort running XHR + this.data.abort(); + } this._delete(); }, |