Skip to content

Commit

Permalink
Rename openFileInfo to fileInfo
Browse files Browse the repository at this point in the history
And check if openFile is set in the URL before opening a file.

Signed-off-by: Louis Chemineau <louis@chmn.me>
  • Loading branch information
artonge committed Jun 19, 2024
1 parent ab85568 commit 8a8a1c7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion apps/files/lib/Controller/ViewController.php
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ private function provideInitialState(string $dir, ?string $fileid): void {
}

$this->initialState->provideInitialState(
'openFileInfo', [
'fileInfo', [
'id' => $node->getId(),
'name' => $isRoot ? '' : $node->getName(),
'path' => $path,
Expand Down
7 changes: 5 additions & 2 deletions apps/files/src/components/FilesListVirtual.vue
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,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)
Expand Down Expand Up @@ -248,6 +247,10 @@ export default defineComponent({
* @param fileId File to open
*/
handleOpenFile(fileId: number|null) {
if (!this.openFile) {
return
}
if (fileId === null || this.openFileId === fileId) {
return
}
Expand Down

0 comments on commit 8a8a1c7

Please sign in to comment.