upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(files): Rename openFileInfo to fileInfo

Browse source 
And check if openFile is set in the URL before opening a file.

Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
Louis Chemineau 2024-06-19 11:18:57 +02:00
parent ab8556872e
commit f7c9ac8b54
No known key found for this signature in database
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/lib/Controller/ViewController.php
View file

@ -292,7 +292,7 @@ class ViewController extends Controller {
}
$this->initialState->provideInitialState(
'openFileInfo', [
'fileInfo', [
'id' => $node->getId(),
'name' => $isRoot ? '' : $node->getName(),
'path' => $path,

7
apps/files/src/components/FilesListVirtual.vue
View file

@ -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)
@ -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
}