From 45ec17514a3e740943a78650907553f6138f2c2d Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Wed, 19 Jun 2024 11:18:57 +0200 Subject: [PATCH] fix(files): Rename openFileInfo to fileInfo And check if openFile is set in the URL before opening a file. Signed-off-by: Louis Chemineau --- apps/files/lib/Controller/ViewController.php | 2 +- apps/files/src/components/FilesListVirtual.vue | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 5172194dd8b..e1d84641e2a 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -341,7 +341,7 @@ class ViewController extends Controller { } $this->initialState->provideInitialState( - 'openFileInfo', [ + 'fileInfo', [ 'id' => $node->getId(), 'name' => $isRoot ? '' : $node->getName(), 'path' => $path, diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index 1318cf7a8fe..c11d33f207a 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -222,8 +222,7 @@ export default defineComponent({ const mainContent = window.document.querySelector('main.app-content') as HTMLElement mainContent.addEventListener('dragover', this.onDragOver) - // handle initially opening a given file - const { id } = loadState<{ id?: number }>('files', 'openFileInfo', {}) + const { id } = loadState<{ id?: number }>('files', 'fileInfo', {}) this.scrollToFile(id ?? this.fileId) this.openSidebarForFile(id ?? this.fileId) this.handleOpenFile(id ?? null) @@ -264,6 +263,10 @@ export default defineComponent({ * @param fileId File to open */ handleOpenFile(fileId: number|null) { + if (!this.openFile) { + return + } + if (fileId === null || this.openFileId === fileId) { return }