diff options
| author | Vincent Chan <plus.vincchan@gmail.com> | 2016-06-14 11:51:03 +0200 |
|---|---|---|
| committer | Vincent Chan <plus.vincchan@gmail.com> | 2016-06-14 11:51:03 +0200 |
| commit | 937d21ed29f29f424aaed7abb643a210ccb2453b (patch) | |
| tree | a611f879900673978f120ac625582485819ebd1d /apps/files/js/filelist.js | |
| parent | 864c3a8fbbe221d7ded83093a2e7c5bde097ef8c (diff) | |
| download | nextcloud-server-937d21ed29f29f424aaed7abb643a210ccb2453b.tar.gz nextcloud-server-937d21ed29f29f424aaed7abb643a210ccb2453b.zip | |
properly fix folder upload to use delegatedEvent
Diffstat (limited to 'apps/files/js/filelist.js')
| -rw-r--r-- | apps/files/js/filelist.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index f249f2d35c9..4b1c07b297e 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2514,12 +2514,13 @@ var self = this; // handle upload events - var fileUploadStart = this.$el.find('#file_upload_start'); + var fileUploadStart = this.$el; + var delegatedElement = '#file_upload_start'; // detect the progress bar resize fileUploadStart.on('resized', this._onResize); - fileUploadStart.on('fileuploaddrop', function(e, data) { + fileUploadStart.on('fileuploaddrop', delegatedElement, function(e, data) { OC.Upload.log('filelist handle fileuploaddrop', e, data); if (self.$el.hasClass('hidden')) { @@ -2527,7 +2528,10 @@ return false; } - var dropTarget = $(e.originalEvent.target); + console.log(e); + var dropTarget = $(e.delegatedEvent.target); + console.log(dropTarget); + // check if dropped inside this container and not another one if (dropTarget.length && !self.$el.is(dropTarget) // dropped on list directly |