-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix getting drop target when dragging from file manager #28692
Conversation
apps/files/js/filelist.js
Outdated
@@ -2708,7 +2708,7 @@ | |||
return false; | |||
} | |||
|
|||
var dropTarget = $(e.originalEvent.target); | |||
var dropTarget = $(e.originalEvent.target || e.originalEvent.delegatedEvent.target); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess the e.original.target
won't be needed any longer.
The change in the library that affects this is
core/apps/files/js/jquery.fileupload.js
Line 1137 in 639dafd
if (that._trigger('drop', e, data) !== false) { |
The actual event isn't set as the originalEvent but as the delegateEvent.
Unless we want compatibility between the library versions, which I don't think it's needed, we can remove the old code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for looking deeper. To be honest I was just too lazy to investigate this detail.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jvillafanez adjusted
77a0a40
to
3e9b68a
Compare
|
|
|
Wrong link? Backport doesn't seem related. |
oh lala, major browser tab fail. I'll fix |
Folder upload seems to be be supported only in chrome. It's very likely a browser limitation. |
Using chrome I mean. |
|
I had a look at this and it's more complex, to be fixed separately. This is not related to the jquery.fileupload library update not recent changes. It is likely present since we moved to Webdav for file operations. |
3e9b68a
to
bab8bc8
Compare
@SergioBertolinSG please retest |
|
Related to jquery.fileupload upgrade, the event has moved
When uploading multiple files into a target folder, sometimes the progress bar does not disappear.
bab8bc8
to
8a69278
Compare
tests fixed |
The estimation of the upload bar is very general (few seconds, minutes, etc) has it changed in this PR? |
I guess it didn't so it works fine. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works fine.
@SergioBertolinSG the estimate was never good... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code looks good
stable10: #28882 |
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Description
Possibly related to jquery.fileupload upgrade, now
e.originalEvent.target might be null.
Related Issue
Fixes #28689.
Motivation and Context
See ticket
How Has This Been Tested?
Manual testing like in the ticket.
Screenshots (if appropriate):
Types of changes
Checklist: