diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2023-07-12 19:49:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 19:49:56 +0200 |
| commit | e9b582164e008a2648bd2e99078145d3e3b114c5 (patch) | |
| tree | 5e56c38f3ed0b9e217a3ed9d9095e545af0c777f /apps | |
| parent | 0f19858a43a18ecc4b4997ff4ff520eabeabfb5c (diff) | |
| parent | ea37d1a2eea1d9f4247c2b57ed6ca8457cba4dc8 (diff) | |
| download | nextcloud-server-e9b582164e008a2648bd2e99078145d3e3b114c5.tar.gz nextcloud-server-e9b582164e008a2648bd2e99078145d3e3b114c5.zip | |
Merge pull request #39333 from nextcloud/backport/38950/stable27
[stable27] fix(files): sanitize name and ext display
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/src/components/FileEntry.vue | 14 | ||||
| -rw-r--r-- | apps/files/src/components/FilesListVirtual.vue | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue index fd61f5e3623..db32f2fab35 100644 --- a/apps/files/src/components/FileEntry.vue +++ b/apps/files/src/components/FileEntry.vue @@ -59,7 +59,11 @@ </span> <!-- File name --> - <span class="files-list__row-name-text">{{ displayName }}</span> + <span class="files-list__row-name-text"> + <!-- Keep the displayName stuck to the extension to avoid whitespace rendering issues--> + <span class="files-list__row-name-name" v-text="displayName" /> + <span class="files-list__row-name-ext" v-text="source.extension" /> + </span> </a> </td> @@ -237,8 +241,12 @@ export default Vue.extend({ return this.source?.fileid?.toString?.() }, displayName() { - return this.source.attributes.displayName - || this.source.basename + const ext = (this.source.extension || '') + const name = (this.source.attributes.displayName + || this.source.basename) + + // Strip extension from name if defined + return !ext ? name : name.slice(0, 0 - ext.length) }, size() { diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index 866fc6da00d..a982cbc09f9 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -299,6 +299,12 @@ export default Vue.extend({ // Make some space for the outline padding: 5px 10px; margin-left: -10px; + // Align two name and ext + display: inline-flex; + } + + .files-list__row-name-ext { + color: var(--color-text-maxcontrast); } } |