upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-26 03:04:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #59904 from nextcloud/fix/drag-31

Browse source 
[stable31] Fix(files): internal drag and drop
This commit is contained in:
Andy Scherzinger 2026-04-27 11:59:03 +02:00 committed by GitHub
commit ebddef3a1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files/src/components/FileEntryMixin.ts
View file

@ -447,7 +447,7 @@ export default defineComponent({
files,
async (nodes, path) => {
try {
const { contents, folder } = await this.activeView!.getContents(path)
const { contents, folder } = await this.currentView!.getContents(path)
const conflicts = getConflicts(nodes, contents)
if (conflicts.length === 0) {
return nodes
@ -479,9 +479,9 @@ export default defineComponent({
}
// We might not have the target directory fetched yet
const cachedContents = this.filesStore.getNodesByPath(this.activeView.id, this.source.path)
const cachedContents = this.filesStore.getNodesByPath(this.currentView.id, this.source.path)
const contents = cachedContents.length === 0
? (await this.activeView!.getContents(this.source.path)).contents
? (await this.currentView!.getContents(this.source.path)).contents
: cachedContents
const isCopy = event.ctrlKey

4
dist/files-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-main.js.map vendored
View file

File diff suppressed because one or more lines are too long