Skip to content

Commit ebddef3

Browse files
Merge pull request #59904 from nextcloud/fix/drag-31
[stable31] Fix(files): internal drag and drop
2 parents f98eecc + 2f653e0 commit ebddef3

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

apps/files/src/components/FileEntryMixin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ export default defineComponent({
447447
files,
448448
async (nodes, path) => {
449449
try {
450-
const { contents, folder } = await this.activeView!.getContents(path)
450+
const { contents, folder } = await this.currentView!.getContents(path)
451451
const conflicts = getConflicts(nodes, contents)
452452
if (conflicts.length === 0) {
453453
return nodes
@@ -479,9 +479,9 @@ export default defineComponent({
479479
}
480480

481481
// We might not have the target directory fetched yet
482-
const cachedContents = this.filesStore.getNodesByPath(this.activeView.id, this.source.path)
482+
const cachedContents = this.filesStore.getNodesByPath(this.currentView.id, this.source.path)
483483
const contents = cachedContents.length === 0
484-
? (await this.activeView!.getContents(this.source.path)).contents
484+
? (await this.currentView!.getContents(this.source.path)).contents
485485
: cachedContents
486486

487487
const isCopy = event.ctrlKey

dist/files-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)