Skip to content
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 upload of folders in Chrome #4153

Merged
merged 1 commit into from Apr 6, 2017
Merged

Fix upload of folders in Chrome #4153

merged 1 commit into from Apr 6, 2017

Conversation

MorrisJobke
Copy link
Member

  • this fixes the problem with the uploads of folders in Chrome, that you noticed
  • thanks for @georgehrke for helping to fix this
  • @karlitschek I will backport this to stable11 as well

@mention-bot
Copy link

@MorrisJobke, thanks for your PR! By analyzing the history of the files in this pull request, we identified @butonic, @luckydonald and @vincchan to be potential reviewers.

@MorrisJobke
Copy link
Member Author

MorrisJobke commented Mar 29, 2017

I tested this and it fixes the issue. 👍

@MorrisJobke
Copy link
Member Author

Backport is in #4154

@MorrisJobke
Copy link
Member Author

@georgehrke Could I ask you to look into fixing the unit tests for this? That would be nice. Thanks :) (feel free to take over those two PRs, because I will be not available Thursday and Friday)

@karlitschek
Copy link
Member

great. please backport

@nickvergessen
Copy link
Member

What does this actually fix? Because I uploaded folders just fine this week on the latest chromium and nextcloud?

Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FAILED
TypeError: undefined is not an object (evaluating 'this._uploads[data.uploadId].data = data') in apps/files/js/file-upload.js (line 541)
getUpload@apps/files/js/file-upload.js:541:32
fail@apps/files/js/file-upload.js:897:33
_trigger@core/vendor/jquery-ui/ui/jquery-ui.custom.js:789:18
add@apps/files/js/file-upload.js:850:18
apps/files/tests/js/fileUploadSpec.js:72:41
collect@core/vendor/underscore/underscore.js:172:32
addFiles@apps/files/tests/js/fileUploadSpec.js:63:15
apps/files/tests/js/fileUploadSpec.js:103:21

@MorrisJobke
Copy link
Member Author

@georgehrke @ChristophWurst @nextcloud/javascript Could one of you help with the JS unit tests? That would be nice :)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member Author

@LukasReschke @georgehrke @rullzer @nickvergessen Please re-review - I fixed it

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine by me... altough I could not reproduce the original issue....

@nickvergessen nickvergessen merged commit 287bae8 into master Apr 6, 2017
@nickvergessen nickvergessen deleted the fix-upload branch April 6, 2017 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants