Skip to content

Commit 1453173

Browse files
authored
Merge pull request #43795 from nextcloud/backport/43784/stable28
2 parents 6a26821 + 8270eda commit 1453173

File tree

5 files changed

+9
-29
lines changed

5 files changed

+9
-29
lines changed

apps/files/src/views/FilesList.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
-
2121
-->
2222
<template>
23-
<NcAppContent data-cy-files-content>
23+
<NcAppContent :page-heading="pageHeading" data-cy-files-content>
2424
<div class="files-list__header">
2525
<!-- Current folder breadcrumbs -->
2626
<BreadCrumbs :path="dir" @reload="fetchContent">
@@ -225,6 +225,10 @@ export default defineComponent({
225225
return this.$navigation.active || this.$navigation.views.find((view) => view.id === (this.$route.params?.view ?? 'files'))
226226
},
227227
228+
pageHeading(): string {
229+
return this.currentView?.name ?? this.t('files', 'Files')
230+
},
231+
228232
/**
229233
* The current directory query.
230234
*/
@@ -567,7 +571,7 @@ export default defineComponent({
567571
* Refreshes the current folder on update.
568572
*
569573
* @param node is the file/folder being updated.
570-
*/
574+
*/
571575
onUpdatedNode(node?: Node) {
572576
if (node?.fileid === this.currentFolder?.fileid) {
573577
this.fetchContent()

apps/files/src/views/Navigation.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
8282
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
8383
import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js'
8484
85-
import { setPageHeading } from '../../../../core/src/OCP/accessibility.js'
8685
import { useViewConfigStore } from '../store/viewConfig.ts'
8786
import logger from '../logger.js'
8887
import type { View } from '@nextcloud/files'
@@ -186,7 +185,6 @@ export default {
186185
// Closing any opened sidebar
187186
window?.OCA?.Files?.Sidebar?.close?.()
188187
this.$navigation.setActive(view)
189-
setPageHeading(view.name)
190188
emit('files:navigation:changed', view)
191189
},
192190

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.LICENSE.txt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -124,28 +124,6 @@
124124
*
125125
*/
126126

127-
/**
128-
* @copyright Copyright (c) 2022 Joas Schilling <[email protected]>
129-
*
130-
* @author Joas Schilling <[email protected]>
131-
*
132-
* @license AGPL-3.0-or-later
133-
*
134-
* This program is free software: you can redistribute it and/or modify
135-
* it under the terms of the GNU Affero General Public License as
136-
* published by the Free Software Foundation, either version 3 of the
137-
* License, or (at your option) any later version.
138-
*
139-
* This program is distributed in the hope that it will be useful,
140-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
141-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
142-
* GNU Affero General Public License for more details.
143-
*
144-
* You should have received a copy of the GNU Affero General Public License
145-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
146-
*
147-
*/
148-
149127
/**
150128
* @copyright Copyright (c) 2022 John Molakvoæ <[email protected]>
151129
*

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)