diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-01-29 15:44:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 15:44:21 +0100 |
| commit | 050b9135d50f57c777c157bb7aa8c102524b2c77 (patch) | |
| tree | d3085793661d511af25d06daf3c50e4975fb199b /apps/files/js/file-upload.js | |
| parent | 754932c7569f61fddd152151fcdcae6dbce9e834 (diff) | |
| parent | 038e665db98ec065bcca6c30c2326362cde0aae8 (diff) | |
| download | nextcloud-server-050b9135d50f57c777c157bb7aa8c102524b2c77.tar.gz nextcloud-server-050b9135d50f57c777c157bb7aa8c102524b2c77.zip | |
Merge pull request #13883 from nextcloud/fix-dropping-a-folder-on-a-folder-row
Fix dropping a folder on a folder row
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 9f1912d590d..79d266a300b 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -523,7 +523,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; } |