Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-01-30 16:09:23 +0300
committerGitHub <noreply@github.com>2019-01-30 16:09:23 +0300
commit9b96db49be4d9d5509acdc37bb95ca7d3a1e2da1 (patch)
tree1898553856f51a03c0c0e59627545e1825f34352
parent9cbcf03a78c59f289440a22337eef13a4b2a3b5b (diff)
parent036bfa08ddd1e452b8e18e1fddf86992db31c1a0 (diff)
Merge pull request #13889 from nextcloud/backport/13883/stable13
[stable13] Fix dropping a folder on a folder row
-rw-r--r--apps/files/js/file-upload.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 9c1e2df53a0..31577e9a76b 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -516,7 +516,9 @@ OC.Uploader.prototype = _.extend({
self.filesClient.createDirectory(fullPath).always(function(status) {
// 405 is expected if the folder already exists
if ((status >= 200 && status < 300) || status === 405) {
- self.trigger('createdfolder', fullPath);
+ if (status !== 405) {
+ self.trigger('createdfolder', fullPath);
+ }
deferred.resolve();
return;
}