Browse Source

Merge pull request #43622 from nextcloud/backport/43604/stable28

tags/v28.0.3rc2
John Molakvoæ 4 months ago
parent
commit
c7ad3bbbbb
No account linked to committer's email address
3 changed files with 11 additions and 6 deletions
  1. 8
    3
      apps/files/src/components/BreadCrumbs.vue
  2. 2
    2
      dist/files-main.js
  3. 1
    1
      dist/files-main.js.map

+ 8
- 3
apps/files/src/components/BreadCrumbs.vue View File

@@ -8,11 +8,13 @@
v-bind="section"
dir="auto"
:to="section.to"
:force-icon-text="true"
:title="titleForSection(index, section)"
:aria-description="ariaForSection(section)"
@click.native="onClick(section.to)">
<template v-if="index === 0" #icon>
<Home :size="20"/>
<NcIconSvgWrapper v-if="section.icon" :size="20" :svg="section.icon" />
<Home v-else :size="20"/>
</template>
</NcBreadcrumb>

@@ -24,11 +26,12 @@
</template>

<script>
import { translate as t} from '@nextcloud/l10n'
import { basename } from 'path'
import { translate as t } from '@nextcloud/l10n'
import Home from 'vue-material-design-icons/Home.vue'
import NcBreadcrumb from '@nextcloud/vue/dist/Components/NcBreadcrumb.js'
import NcBreadcrumbs from '@nextcloud/vue/dist/Components/NcBreadcrumbs.js'
import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js'
import Vue from 'vue'

import { useFilesStore } from '../store/files.ts'
@@ -41,6 +44,7 @@ export default Vue.extend({
Home,
NcBreadcrumbs,
NcBreadcrumb,
NcIconSvgWrapper,
},

props: {
@@ -81,6 +85,7 @@ export default Vue.extend({
exact: true,
name: this.getDirDisplayName(dir),
to,
icon: this.$navigation.active?.icon || null,
}
})
},
@@ -95,7 +100,7 @@ export default Vue.extend({
},
getDirDisplayName(path) {
if (path === '/') {
return t('files', 'Home')
return this.$navigation?.active?.name || t('files', 'Home')
}

const fileId = this.getFileIdFromPath(path)

+ 2
- 2
dist/files-main.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/files-main.js.map
File diff suppressed because it is too large
View File


Loading…
Cancel
Save