From 216804f83d5af391a8a4cc56de89280e3fcdd3bf Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Thu, 21 Sep 2023 12:15:37 +0200 Subject: fix(files): title and inline actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) Signed-off-by: nextcloud-command --- apps/files/src/components/FileEntry.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'apps/files/src/components') diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue index 83b991dcd50..f9320a55e15 100644 --- a/apps/files/src/components/FileEntry.vue +++ b/apps/files/src/components/FileEntry.vue @@ -130,12 +130,13 @@ :class="'files-list__row-action-' + action.id" :close-after-click="true" :data-cy-files-list-row-action="action.id" + :title="action.title?.([source], currentView)" @click="onActionClick(action)"> - {{ action.displayName([source], currentView) }} + {{ actionDisplayName(action) }} @@ -180,7 +181,7 @@ import { debounce } from 'debounce' import { emit } from '@nextcloud/event-bus' import { extname } from 'path' import { generateUrl } from '@nextcloud/router' -import { getFileActions, DefaultType, FileType, formatFileSize, Permission, Folder, File, Node } from '@nextcloud/files' +import { getFileActions, DefaultType, FileType, formatFileSize, Permission, Folder, File, Node, FileAction } from '@nextcloud/files' import { Type as ShareType } from '@nextcloud/sharing' import { showError, showSuccess } from '@nextcloud/dialogs' import { translate } from '@nextcloud/l10n' @@ -918,6 +919,16 @@ export default Vue.extend({ return document.querySelector('.app-content > .files-list') }, + actionDisplayName(action: FileAction) { + if (this.filesListWidth < 768 && action.inline && typeof action.title === 'function') { + // if an inline action is rendered in the menu for + // lack of space we use the title first if defined + const title = action.title([this.source], this.currentView) + if (title) return title + } + return action.displayName([this.source], this.currentView) + }, + t: translate, formatFileSize, }, -- cgit v1.2.3