Properly abort uploads #30620
Merged
Properly abort uploads #30620
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
since now the deletion of the upload object is delayed, it messed up with the accounting that operates the progress bar I've pushed a fix to properly count the finished uploads so that the progress bar can be hidden, also in error cases. |
PVince81
added
3. to review
artonge
approved these changes
Jan 12, 2022
apps/files/js/file-upload.js
Outdated
| abort: function() { | ||
| if (this.data.isChunked) { | ||
| this._deleteChunkFolder(); | ||
| var self = this; |
There was a problem hiding this comment.
self variable looks unused
There was a problem hiding this comment.
ah, leftover from previous fiddling. thanks for noticing
Pytal
approved these changes
Jan 12, 2022
PVince81
added
4. to release
Add a new approach for flagging an upload as aborted because we can't rely on the browser fully cancelling the request as we now seem to receive an error response from the server instead of a jQuery "abort" message. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Whenever an error occurs, also hide the progress bar. The logic was also adjusted to properly detect uploads that are pending deletion, in which case the progress bar can already be hidden. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
PVince81
force-pushed
the
bugfix/14897/fix-cancelling
branch
from
d913f41 to
11c7e10
Compare
|
I've fixed some bogus references to self and retested |
|
/backport to stable23 |
|
/backport to stable22 |
|
/backport to stable21 |
This was referenced Jan 13, 2022
|
This is excellent news!! Thank you so much, @PVince81! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a new approach for flagging an upload as aborted because we can't
rely on the browser fully cancelling the request as we now seem to
receive an error response from the server instead of a jQuery "abort"
message.
Fixes: #14897
progress bar not removed!