mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4153 from nextcloud/fix-upload 

Fix upload of folders in Chrome
This commit is contained in:
Joas Schilling 2017-04-06 09:56:41 +02:00 committed by GitHub
parent b084ceec3d 6e72fd5f9f
commit 287bae8c5f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files/js/file-upload.js
View File

@ -537,7 +537,8 @@ OC.Uploader.prototype = _.extend({
getUpload: function(data) { getUpload: function(data) {
if (_.isString(data)) { if (_.isString(data)) {
return this._uploads[data]; return this._uploads[data];
} else if (data.uploadId) { } else if (data.uploadId && this._uploads[data.uploadId]) {
this._uploads[data.uploadId].data = data;
return this._uploads[data.uploadId]; return this._uploads[data.uploadId];
} }
return null; return null;