Skip to content

Fix getting drop target when dragging from file manager #28692

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.

Sign up for GitHub

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

Merged
PVince81 merged 3 commits into from
Sep 1, 2017
Merged

Fix getting drop target when dragging from file manager #28692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40f5aaf
Fix getting drop target when dragging from file manager
Aug 15, 2017
8e30bb8
Always pass requesttoken on uploads
Aug 31, 2017
8a69278
Progress bar must disappear at the of upload
Aug 31, 2017
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
13 changes: 9 additions & 4 deletions apps/files/js/file-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ OC.FileUpload.prototype = {
this.data.headers['Authorization'] =
'Basic ' + btoa(userName + ':' + (password || ''));
}
this.data.headers['requesttoken'] = OC.requestToken;

var chunkFolderPromise;
if ($.support.blobSlice
Expand Down Expand Up @@ -1195,11 +1196,15 @@ OC.Uploader.prototype = _.extend({
fileupload.on('fileuploaddone', function(e, data) {
var upload = self.getUpload(data);
upload.done().then(function() {
// don't hide if there are more files to process
if (!self.isProcessing()) {
self._hideProgressBar();
}
self.trigger('done', e, upload);
// defer because sometimes the current upload is still in pending
// state but frees itself afterwards
_.defer(function() {
// don't hide if there are more files to process
if (!self.isProcessing()) {
self._hideProgressBar();
}
});
}).fail(function(status, response) {
var message = response.message;
self._hideProgressBar();
Expand Down
2 changes: 1 addition & 1 deletion apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2702,7 +2702,7 @@
return false;
}

var dropTarget = $(e.originalEvent.target);
var dropTarget = $(e.originalEvent.delegatedEvent.target);
// check if dropped inside this container and not another one
if (dropTarget.length
&& !self.$el.is(dropTarget) // dropped on list directly
Expand Down
4 changes: 3 additions & 1 deletion apps/files/tests/js/filelistSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2649,7 +2649,9 @@ describe('OCA.Files.FileList tests', function() {
function dropOn($target, data) {
var eventData = {
originalEvent: {
target: $target
delegatedEvent: {
target: $target
}
}
};
uploader.trigger('drop', eventData, data || {});
Expand Down